Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 按UI设计要求调整插件管理标题与说明文字间距 (#728)

Browse Source 
按UI设计要求调整插件管理标题与说明文字间距

Log: 按UI设计要求调整插件管理标题与说明文字间距
Bug: https://pms.uniontech.com/bug-view-173635.html
Influence: 按UI设计要求调整插件管理标题与说明文字间距
This commit is contained in:
chenjun 2022-11-29 10:05:25 +08:00 committed by GitHub
parent 02974ef4ca
commit a20006aa2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/dcc-dock-plugin/module_widget.cpp
View File

@ -93,7 +93,7 @@ void ModuleWidget::initUI()
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
layout->setContentsMargins(10, 10, 10, 10); layout->setContentsMargins(10, 10, 10, 10);
layout->setSpacing(10); layout->setSpacing(0);
static QMap<QString, int> g_modeMap = {{tr("Fashion mode"), Fashion} static QMap<QString, int> g_modeMap = {{tr("Fashion mode"), Fashion}
, {tr("Efficient mode"), Efficient}}; , {tr("Efficient mode"), Efficient}};
@ -144,6 +144,7 @@ void ModuleWidget::initUI()
m_positionComboxWidget->setCurrentText(g_positionMap.key(pos)); m_positionComboxWidget->setCurrentText(g_positionMap.key(pos));
}); });
layout->addSpacing(10);
layout->addWidget(m_positionComboxWidget); layout->addWidget(m_positionComboxWidget);
m_dconfigWatcher->bind("dockLocation", m_positionComboxWidget); m_dconfigWatcher->bind("dockLocation", m_positionComboxWidget);
} else { } else {
@ -172,6 +173,7 @@ void ModuleWidget::initUI()
m_stateComboxWidget->setCurrentText(g_stateMap.key(mode)); m_stateComboxWidget->setCurrentText(g_stateMap.key(mode));
}); });
layout->addSpacing(10);
layout->addWidget(m_stateComboxWidget); layout->addWidget(m_stateComboxWidget);
m_dconfigWatcher->bind("dockState", m_stateComboxWidget); m_dconfigWatcher->bind("dockState", m_stateComboxWidget);
} else { } else {
@ -209,6 +211,7 @@ void ModuleWidget::initUI()
updateSliderValue(); updateSliderValue();
m_dconfigWatcher->bind("dockSize", m_sizeSlider); m_dconfigWatcher->bind("dockSize", m_sizeSlider);
layout->addSpacing(10);
layout->addWidget(m_sizeSlider); layout->addWidget(m_sizeSlider);
// 多屏显示设置 // 多屏显示设置
@ -246,6 +249,7 @@ void ModuleWidget::initUI()
m_screenSettingComboxWidget->setCurrentText(g_screenSettingMap.key(showInPrimary)); m_screenSettingComboxWidget->setCurrentText(g_screenSettingMap.key(showInPrimary));
m_screenSettingComboxWidget->blockSignals(false); m_screenSettingComboxWidget->blockSignals(false);
}); });
layout->addSpacing(10);
layout->addWidget(m_screenSettingComboxWidget); layout->addWidget(m_screenSettingComboxWidget);
m_dconfigWatcher->bind("multiscreen", m_screenSettingTitle); m_dconfigWatcher->bind("multiscreen", m_screenSettingTitle);
m_dconfigWatcher->bind("multiscreen", m_screenSettingComboxWidget); m_dconfigWatcher->bind("multiscreen", m_screenSettingComboxWidget);
@ -276,15 +280,16 @@ void ModuleWidget::initUI()
, {"trash", "dcc_dock_trash"} , {"trash", "dcc_dock_trash"}
, {"shot-start-plugin", "shot-start-plugin"}}; , {"shot-start-plugin", "shot-start-plugin"}};
if (plugins.size() != 0) { if (plugins.size() != 0) {
layout->addSpacing(10); layout->addSpacing(20);
layout->addWidget(m_pluginAreaTitle); layout->addWidget(m_pluginAreaTitle);
m_dconfigWatcher->bind("dockPlugins", m_pluginAreaTitle); m_dconfigWatcher->bind("dockPlugins", m_pluginAreaTitle);
DFontSizeManager::instance()->bind(m_pluginTips, DFontSizeManager::T8); DFontSizeManager::instance()->bind(m_pluginTips, DFontSizeManager::T8);
m_pluginTips->adjustSize(); m_pluginTips->adjustSize();
m_pluginTips->setWordWrap(true); m_pluginTips->setWordWrap(true);
m_pluginTips->setContentsMargins(10, 5, 10, 5); m_pluginTips->setContentsMargins(10, 0, 10, 0);
m_pluginTips->setAlignment(Qt::AlignLeft); m_pluginTips->setAlignment(Qt::AlignLeft);
layout->addSpacing(2);
layout->addWidget(m_pluginTips); layout->addWidget(m_pluginTips);
m_dconfigWatcher->bind("dockPlugins", m_pluginTips); m_dconfigWatcher->bind("dockPlugins", m_pluginTips);
@ -309,6 +314,7 @@ void ModuleWidget::initUI()
m_pluginView->setModel(m_pluginModel); m_pluginView->setModel(m_pluginModel);
layout->addSpacing(10);
layout->addWidget(m_pluginView); layout->addWidget(m_pluginView);
m_dconfigWatcher->bind("dockPlugins", m_pluginView); m_dconfigWatcher->bind("dockPlugins", m_pluginView);