fix: bluetooth and network plugin applet layout error when clicked by…

… icon on quick panel also modify the margin with other plugin log: as title issue: linuxdeepin/developer-center#7704
linuxdeepin · Apr 29, 2024 · fe54020 · fe54020
1 parent 6bdea9e
commit fe54020
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 27 deletions.
diff --git a/panels/dock/tray/plugins/bluetooth/componments/bluetoothapplet.cpp b/panels/dock/tray/plugins/bluetooth/componments/bluetoothapplet.cpp
@@ -268,7 +268,7 @@ void BluetoothApplet::initUi()
     m_scroarea->setContentsMargins(0, 0, 0, 0);
     m_scroarea->setWidget(m_contentWidget);
 
-    updateIconTheme();
+    // updateIconTheme();
 
     m_mainLayout->setContentsMargins(QMargins(0, 0, 0, 0));
     m_mainLayout->setSpacing(0);
@@ -294,29 +294,29 @@ void BluetoothApplet::initConnect()
         .call();
         emit requestHide();
     });
-    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, &BluetoothApplet::updateIconTheme);
+    // connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, &BluetoothApplet::updateIconTheme);
     connect(m_airPlaneModeInter, &DBusAirplaneMode::EnabledChanged, this, &BluetoothApplet::setAirplaneModeEnabled);
     connect(m_airPlaneModeInter, &DBusAirplaneMode::EnabledChanged, this, &BluetoothApplet::setDisabled);
 }
 
-/**
- * @brief BluetoothApplet::updateIconTheme 根据主题颜色设置蓝牙界面控件背景色
- */
-void BluetoothApplet::updateIconTheme()
-{
-    QPalette widgetBackgroud;
-    QPalette scroareaBackgroud;
-    if(DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType)
-        widgetBackgroud.setColor(QPalette::Window, QColor(255, 255, 255, 0.03 * 255));
-    else
-        widgetBackgroud.setColor(QPalette::Window, QColor(0, 0, 0, 0.03 * 255));
-
-    m_contentWidget->setAutoFillBackground(true);
-    m_contentWidget->setPalette(widgetBackgroud);
-    scroareaBackgroud.setColor(QPalette::Window, Qt::transparent);
-    m_scroarea->setAutoFillBackground(true);
-    m_scroarea->setPalette(scroareaBackgroud);
-}
+// /**
+//  * @brief BluetoothApplet::updateIconTheme 根据主题颜色设置蓝牙界面控件背景色
+//  */
+// void BluetoothApplet::updateIconTheme()
+// {
+//     QPalette widgetBackgroud;
+//     QPalette scroareaBackgroud;
+//     if(DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType)
+//         widgetBackgroud.setColor(QPalette::Window, QColor(255, 255, 255, 0.03 * 255));
+//     else
+//         widgetBackgroud.setColor(QPalette::Window, QColor(0, 0, 0, 0.03 * 255));
+
+//     m_contentWidget->setAutoFillBackground(true);
+//     m_contentWidget->setPalette(widgetBackgroud);
+//     scroareaBackgroud.setColor(QPalette::Window, Qt::transparent);
+//     m_scroarea->setAutoFillBackground(true);
+//     m_scroarea->setPalette(scroareaBackgroud);
+// }
 
 void BluetoothApplet::initAdapters()
 {

diff --git a/panels/dock/tray/plugins/bluetooth/componments/bluetoothapplet.h b/panels/dock/tray/plugins/bluetooth/componments/bluetoothapplet.h
@@ -104,7 +104,7 @@ public slots:
     void initConnect();
     // 更新蓝牙插件主界面大小
     void updateSize();
-    void updateIconTheme();
+    // void updateIconTheme();
     void initAdapters();
 
 private:

diff --git a/panels/dock/tray/plugins/bluetooth/componments/bluetoothconstants.h b/panels/dock/tray/plugins/bluetooth/componments/bluetoothconstants.h
@@ -6,7 +6,7 @@
 #define BLUETOOTHCONSTANTS_H
 
 const int DeviceItemHeight = 36;
-const int ItemWidth = 300;
+const int ItemWidth = 330;
 const int TitleHeight = 46;
 const int TitleSpace = 2;
 const int MaxDeviceCount = 8;

diff --git a/panels/dock/tray/plugins/dde-network-core/common-plugin/networkdialog/item/netitem.h b/panels/dock/tray/plugins/dde-network-core/common-plugin/networkdialog/item/netitem.h
@@ -58,7 +58,7 @@ enum NetItemRole {
     sortRole
 };
 
-#define PANELWIDTH 300
+#define PANELWIDTH 330
 
 enum NetItemType {
     DeviceControllViewItem = 0, // 总控开关

diff --git a/panels/dock/tray/plugins/display/displaysettingwidget.cpp b/panels/dock/tray/plugins/display/displaysettingwidget.cpp
@@ -29,7 +29,7 @@ DisplaySettingWidget::DisplaySettingWidget(BrightnessModel *model, QWidget *pare
 
 void DisplaySettingWidget::initUI()
 {
-    setContentsMargins(0, 10, 0, 30);
+    setContentsMargins(10, 10, 10, 10);
     QVBoxLayout *mainLayout = new QVBoxLayout();
     mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setSpacing(ItemSpacing);

diff --git a/panels/dock/tray/plugins/pluginmanager/pluginchildpage.cpp b/panels/dock/tray/plugins/pluginmanager/pluginchildpage.cpp
@@ -62,7 +62,7 @@ void PluginChildPage::initUi()
     m_back->setFlat(true);
     m_title->setAlignment(Qt::AlignCenter);
     QHBoxLayout *headerLayout = new QHBoxLayout(m_headerWidget);
-    headerLayout->setContentsMargins(11, 12, 24 + 11, 12);
+    headerLayout->setContentsMargins(11, 12, 11, 12);
     headerLayout->setSpacing(0);
     headerLayout->addWidget(m_back);
     headerLayout->addWidget(m_title);
@@ -74,7 +74,7 @@ void PluginChildPage::initUi()
 
     mainLayout->addWidget(m_headerWidget);
     mainLayout->addWidget(m_container);
-    m_containerLayout->setContentsMargins(11, 0, 11, 0);
+    m_containerLayout->setContentsMargins(0, 0, 0, 0);
     m_containerLayout->setSpacing(0);
 }
 

diff --git a/panels/dock/tray/plugins/sound/sounddeviceswidget.cpp b/panels/dock/tray/plugins/sound/sounddeviceswidget.cpp
@@ -91,11 +91,12 @@ bool SoundDevicesWidget::eventFilter(QObject *watcher, QEvent *event)
 
 void SoundDevicesWidget::initUi()
 {
+    setContentsMargins(0, 0, 0, 0);
     m_tipsLabel->setAccessibleName("soundtips");
     m_tipsLabel->setVisible(false);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setContentsMargins(10, 0, 10, 0);
+    layout->setContentsMargins(10, 10, 10, 10);
 
     QPixmap leftPixmap = QIcon::fromTheme(QString("audio-volume-%1-symbolic").arg(m_sinkInter->mute() ? "muted" : "off")).pixmap(18, 18);
     m_sliderContainer->setIcon(SliderContainer::IconPosition::LeftIcon, leftPixmap, QSize(), 5);