diff --git a/AdvancedDockingSystem/res/stylesheets/default-windows.css b/AdvancedDockingSystem/res/stylesheets/default-windows.css index 08fe543..cc49cdc 100644 --- a/AdvancedDockingSystem/res/stylesheets/default-windows.css +++ b/AdvancedDockingSystem/res/stylesheets/default-windows.css @@ -17,6 +17,7 @@ ads--SectionWidget, SectionWidget { ads--SectionTitleWidget, SectionTitleWidget { background: palette(window); + padding: 9px; } ads--SectionTitleWidget[activeTab="true"], SectionTitleWidget[activeTab="true"] { diff --git a/AdvancedDockingSystem/res/stylesheets/vendor-partsolutions.css b/AdvancedDockingSystem/res/stylesheets/vendor-partsolutions.css index 38c5848..b48c0a9 100644 --- a/AdvancedDockingSystem/res/stylesheets/vendor-partsolutions.css +++ b/AdvancedDockingSystem/res/stylesheets/vendor-partsolutions.css @@ -21,13 +21,12 @@ ads--SectionWidget, SectionWidget { border-color: #ffffff; border-style: solid; border-width: 1px; - margin: 0; - padding: 0; } ads--SectionTitleWidget, SectionTitleWidget { background: #7c9eb3; border-right: 1px solid #E7F3F8; + padding: 6px 6px; } ads--SectionTitleWidget[activeTab="true"], SectionTitleWidget[activeTab="true"] { @@ -41,7 +40,8 @@ ads--SectionContentWidget, SectionContentWidget { } /* Special */ -/* -ads--SectionTitleWidget IconTitleWidget QLabel { color: #000000; } -ads--FloatingWidget QPushButton { background: #E7F3F8; } -*/ \ No newline at end of file + +IconTitleWidget { + padding: 0; + margin: 0; +} \ No newline at end of file diff --git a/AdvancedDockingSystem/src/SectionTitleWidget.cpp b/AdvancedDockingSystem/src/SectionTitleWidget.cpp index 48ed562..73aa5fb 100644 --- a/AdvancedDockingSystem/src/SectionTitleWidget.cpp +++ b/AdvancedDockingSystem/src/SectionTitleWidget.cpp @@ -32,6 +32,8 @@ SectionTitleWidget::SectionTitleWidget(SectionContent::RefPtr content, QWidget* _activeTab(false) { QBoxLayout* l = new QBoxLayout(QBoxLayout::LeftToRight); + l->setContentsMargins(0, 0, 0, 0); + l->setSpacing(0); l->addWidget(content->titleWidget()); setLayout(l); } @@ -261,7 +263,7 @@ void SectionTitleWidget::mouseMoveEvent(QMouseEvent* ev) int left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); QPoint moveToPos = mapToParent(ev->pos()) - _dragStartPos; - moveToPos.setY(0 + top); + moveToPos.setY(0/* + top*/); move(moveToPos); ev->accept(); } diff --git a/AdvancedDockingSystemDemo/src/icontitlewidget.cpp b/AdvancedDockingSystemDemo/src/icontitlewidget.cpp index 9f69233..85d7946 100644 --- a/AdvancedDockingSystemDemo/src/icontitlewidget.cpp +++ b/AdvancedDockingSystemDemo/src/icontitlewidget.cpp @@ -16,9 +16,9 @@ IconTitleWidget::IconTitleWidget(const QIcon& icon, const QString& title, QWidge // Icon label if (icon.isNull()) { - QLabel* titleIcon = new QLabel(); - titleIcon->setPixmap(style()->standardIcon(QStyle::SP_MessageBoxInformation).pixmap(16, 16)); - l->addWidget(titleIcon); +// QLabel* titleIcon = new QLabel(); +// titleIcon->setPixmap(style()->standardIcon(QStyle::SP_MessageBoxInformation).pixmap(16, 16)); +// l->addWidget(titleIcon); } else { @@ -30,7 +30,6 @@ IconTitleWidget::IconTitleWidget(const QIcon& icon, const QString& title, QWidge // Title label QLabel* titleText = new QLabel(title); QFont titleFont = titleText->font(); - titleFont.setBold(true); titleText->setFont(titleFont); l->addWidget(titleText, 1); } diff --git a/AdvancedDockingSystemDemo/src/main.cpp b/AdvancedDockingSystemDemo/src/main.cpp index c5c13fd..f974662 100644 --- a/AdvancedDockingSystemDemo/src/main.cpp +++ b/AdvancedDockingSystemDemo/src/main.cpp @@ -12,8 +12,8 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(ads); // Load style sheet - // QFile f(":/stylesheets/default-windows.css"); - QFile f(":/stylesheets/vendor-partsolutions.css"); + QFile f(":/stylesheets/default-windows.css"); +// QFile f(":/stylesheets/vendor-partsolutions.css"); if (f.open(QFile::ReadOnly)) { QByteArray ba = f.readAll();