feat: [mainwindow] optimized ui of mainWindow

reduce width of separator between docks Log: as title
linuxdeepin · Nov 21, 2024 · 4882bb7 · 4882bb7
1 parent 0fc225d
commit 4882bb7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/src/plugins/core/uicontroller/controller.cpp b/src/plugins/core/uicontroller/controller.cpp
@@ -945,7 +945,7 @@ void Controller::initNavigationBar()
     d->navigationToolBar->hide();
 
     vLayout->addWidget(d->navigationBar);
-    vLayout->setContentsMargins(0, 0, 2, 0);
+    vLayout->setContentsMargins(0, 0, 1, 0);
 }
 
 void Controller::initContextWidget()

diff --git a/src/plugins/core/uicontroller/mainwindow.cpp b/src/plugins/core/uicontroller/mainwindow.cpp
@@ -65,9 +65,9 @@ MainWindow::MainWindow(QWidget *parent)
     setWindowIcon(QIcon::fromTheme("ide"));
     setAttribute(Qt::WA_DeleteOnClose);
 
+    setStyle(new CustomStyle());
     addTopToolBar();
     setContextMenuPolicy(Qt::NoContextMenu);   //donot show left toolbar`s contextmenu
-    //setStyleSheet("QMainWindow::separator { width: 2px; margin: 0px; padding: 0px; }");
 
     setCorner(Qt::Corner::BottomLeftCorner, Qt::DockWidgetArea::LeftDockWidgetArea);
     setCorner(Qt::Corner::TopLeftCorner, Qt::DockWidgetArea::LeftDockWidgetArea);

diff --git a/src/plugins/core/uicontroller/mainwindow.h b/src/plugins/core/uicontroller/mainwindow.h
@@ -10,13 +10,27 @@
 #include <DMainWindow>
 #include <DMenu>
 #include <DDockWidget>
+#include <DStyle>
 
 #include <QObject>
 #include <QWidgetList>
 #include <QMap>
 #include <QString>
 
 DWIDGET_USE_NAMESPACE
+
+class CustomStyle : public DStyle
+{
+public:
+    explicit CustomStyle() : DStyle() { }
+    int pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt = nullptr, const QWidget *widget = nullptr) const override
+    {
+        if (m == PM_DockWidgetSeparatorExtent)
+            return 2;
+        return DStyle::pixelMetric(m, opt, widget);
+    }
+};
+
 using dpfservice::Position;
 class MainWindowPrivate;
 class MainWindow : public DMainWindow

diff --git a/src/plugins/project/mainframe/projecttree.cpp b/src/plugins/project/mainframe/projecttree.cpp
@@ -58,6 +58,7 @@ ProjectTree::ProjectTree(QWidget *parent)
 {
     setLineWidth(0);
     setContentsMargins(0, 0, 0, 0);
+    setFrameShape(QFrame::NoFrame);
     DStyle::setFrameRadius(this, 0);
     setIconSize(QSize(16, 16));
 

diff --git a/src/plugins/symbol/mainframe/symboltreeview.cpp b/src/plugins/symbol/mainframe/symboltreeview.cpp
@@ -33,6 +33,7 @@ SymbolTreeView::SymbolTreeView(DWidget *parent)
     : DTreeView(parent), d(new SymbolTreeViewPrivate(this))
 {
     setLineWidth(0);
+    setFrameShape(QFrame::NoFrame);
 
     d->model = new SymbolModel();
     DTreeView::setModel(d->model);