From 8d95553e824dab5db0689bddf0a770dae9aa9a16 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Wed, 28 Nov 2018 20:28:28 +0800 Subject: [PATCH] fix margin of VToolBox --- src/vexplorer.cpp | 2 +- src/vhistorylist.cpp | 2 +- src/vmainwindow.cpp | 1 + src/vtoolbox.cpp | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vexplorer.cpp b/src/vexplorer.cpp index 15b25c36..ed32c373 100644 --- a/src/vexplorer.cpp +++ b/src/vexplorer.cpp @@ -244,7 +244,7 @@ void VExplorer::setupUI() mainLayout->addWidget(m_imgFolderEdit); mainLayout->addLayout(btnLayout); mainLayout->addWidget(m_tree); - mainLayout->setContentsMargins(3, 0, 3, 0); + mainLayout->setContentsMargins(0, 0, 0, 0); setLayout(mainLayout); } diff --git a/src/vhistorylist.cpp b/src/vhistorylist.cpp index d93e7447..fb615f9b 100644 --- a/src/vhistorylist.cpp +++ b/src/vhistorylist.cpp @@ -77,7 +77,7 @@ void VHistoryList::setupUI() QVBoxLayout *mainLayout = new QVBoxLayout(); mainLayout->addLayout(btnLayout); mainLayout->addWidget(m_itemList); - mainLayout->setContentsMargins(3, 0, 3, 0); + mainLayout->setContentsMargins(0, 0, 0, 0); setLayout(mainLayout); } diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp index 1d195564..c9f3763c 100644 --- a/src/vmainwindow.cpp +++ b/src/vmainwindow.cpp @@ -303,6 +303,7 @@ void VMainWindow::setupUI() void VMainWindow::setupNaviBox() { m_naviBox = new VToolBox(); + m_naviBox->setObjectName("MainToolBox"); setupNotebookPanel(); m_naviBox->addItem(m_nbSplitter, diff --git a/src/vtoolbox.cpp b/src/vtoolbox.cpp index cf8d75db..7edd9e43 100644 --- a/src/vtoolbox.cpp +++ b/src/vtoolbox.cpp @@ -35,7 +35,8 @@ void VToolBox::setupUI() QVBoxLayout *mainLayout = new QVBoxLayout(); mainLayout->addWidget(wid); mainLayout->addLayout(m_widgetLayout); - mainLayout->setContentsMargins(0, 0, 0, 0); + int margin = 2 * VUtils::calculateScaleFactor(); + mainLayout->setContentsMargins(margin, 0, margin, 0); setLayout(mainLayout); }