Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [mainwindow] optimized ui of mainWindow #1002

Merged
merged 1 commit into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/core/uicontroller/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/core/uicontroller/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 14 additions & 0 deletions src/plugins/core/uicontroller/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/plugins/project/mainframe/projecttree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
1 change: 1 addition & 0 deletions src/plugins/symbol/mainframe/symboltreeview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading