From f7b3c8b49687e7d8ae44f226054ca046f8489f7c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 4 Jan 2015 08:04:37 -0800 Subject: [PATCH] The margin between toolbar and profile looked strange Especially on Mac where there is already a lot of padding around the action buttons. Also made the spelling of the zeroMargins variable more consistent. Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index c3b8281f7..2ae9b74f9 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -147,7 +147,7 @@ MainWindow::MainWindow() : QMainWindow(), // and now for some layout hackery // this gets us consistent margins everywhere and a much more balanced look QMargins margins(5, 5, 5, 5); - QMargins zeroMargin(0, 0, 0, 0); + QMargins zeroMargins(0, 0, 0, 0); QList noMarginList; noMarginList << "notesAndSocialNetworksLayout" << "mainTabOuterLayout" << @@ -164,12 +164,15 @@ MainWindow::MainWindow() : QMainWindow(), // this allows us to exclude specific layouts where the one size fits all // doesn't fit if (noMarginList.contains(layout->objectName())) - layout->setContentsMargins(zeroMargin); + layout->setContentsMargins(zeroMargins); else layout->setContentsMargins(margins); } margins = QMargins(0, 5, 5, 5); ui.profileInnerLayout->setContentsMargins(margins); + ui.profileInnerLayout->setSpacing(0); + toolBar->setContentsMargins(zeroMargins); + updateManager = new UpdateManager(this); }