From 8adef3b995b64c79e3cdf8e97d31f96833389383 Mon Sep 17 00:00:00 2001
From: CozmoP <25121396+CozmoP@users.noreply.github.com>
Date: Mon, 14 Jan 2019 20:06:07 +0100
Subject: [PATCH] Qt: move some styles to stylesheet

---
 ui/drivers/qt/ui_qt_themes.h   | 13 ++++++++++---
 ui/drivers/qt/ui_qt_window.cpp |  4 ++--
 ui/drivers/ui_qt.cpp           | 10 ++++++----
 ui/drivers/ui_qt.h             |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ui/drivers/qt/ui_qt_themes.h b/ui/drivers/qt/ui_qt_themes.h
index 0f24aef04b..bae9130899 100644
--- a/ui/drivers/qt/ui_qt_themes.h
+++ b/ui/drivers/qt/ui_qt_themes.h
@@ -16,6 +16,12 @@ static const QString qt_theme_default_stylesheet = QStringLiteral(R"(
       background-color:#d4d4d4;
       border:3px solid %1;
    }
+   QFrame#playlistWidget, QFrame#browserWidget, QFrame#logWidget {
+      padding: 8px;
+   }
+   ListWidget {
+      icon-size: 32px;
+   }
 )");
 
 static const QString qt_theme_dark_stylesheet = QStringLiteral(R"(
@@ -24,15 +30,16 @@ static const QString qt_theme_dark_stylesheet = QStringLiteral(R"(
       background-color:rgb(53,53,53);
       selection-background-color:%1;
    }
-   QWidget#playlistWidget, QWidget#browserWidget, QStackedWidget#centralWidget, QWidget#logWidget {
+   QFrame#playlistWidget, QFrame#browserWidget, QStackedWidget#centralWidget, QFrame#logWidget {
+      padding: 8px;
       background-color:rgb(66,66,66);
       border-top:1px solid rgba(175,175,175,50%);
       border-left:1px solid rgba(125,125,125,50%);
       border-right:1px solid rgba(125,125,125,50%);
       border-bottom:1px solid rgba(25,25,25,75%);
    }
-   QStackedWidget#centralWidget {
-      padding: 10px;
+   ListWidget {
+      icon-size: 32px;
    }
    QTextEdit, LogTextEdit {
       background-color:rgb(25,25,25);
diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp
index ce33700bf3..144441c479 100644
--- a/ui/drivers/qt/ui_qt_window.cpp
+++ b/ui/drivers/qt/ui_qt_window.cpp
@@ -308,7 +308,7 @@ MainWindow::MainWindow(QWidget *parent) :
    ,m_coreInfoLabel(new CoreInfoLabel(QString(), this))
    ,m_coreInfoWidget(new CoreInfoWidget(m_coreInfoLabel, this))
    ,m_logDock(new QDockWidget(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_LOG), this))
-   ,m_logWidget(new QWidget(this))
+   ,m_logWidget(new QFrame(this))
    ,m_logTextEdit(new LogTextEdit(m_logWidget))
    ,m_historyPlaylistsItem(NULL)
    ,m_folderIcon()
@@ -575,6 +575,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
    m_logWidget->setLayout(new QVBoxLayout());
    m_logWidget->layout()->addWidget(m_logTextEdit);
+   m_logWidget->layout()->setContentsMargins(0, 0, 0, 0);
 
    m_logDock->setObjectName("logDock");
    m_logDock->setProperty("default_area", Qt::BottomDockWidgetArea);
@@ -592,7 +593,6 @@ MainWindow::MainWindow(QWidget *parent) :
 
    m_dirTree->setContextMenuPolicy(Qt::CustomContextMenu);
    m_listWidget->setContextMenuPolicy(Qt::CustomContextMenu);
-   m_listWidget->setIconSize(QSize(32, 32));
 
    connect(m_searchLineEdit, SIGNAL(returnPressed()), this, SLOT(onSearchEnterPressed()));
    connect(m_searchLineEdit, SIGNAL(textEdited(const QString&)), this, SLOT(onSearchLineEditEdited(const QString&)));
diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp
index 2885d0b8fe..56e1564602 100644
--- a/ui/drivers/ui_qt.cpp
+++ b/ui/drivers/ui_qt.cpp
@@ -241,8 +241,8 @@ static void* ui_companion_qt_init(void)
    QTabWidget *browserAndPlaylistTabWidget = NULL;
    QStackedWidget *centralWidget = NULL;
    QStackedWidget *widget = NULL;
-   QWidget *browserWidget = NULL;
-   QWidget *playlistWidget = NULL;
+   QFrame *browserWidget = NULL;
+   QFrame *playlistWidget = NULL;
    QWidget *coreSelectionWidget = NULL;
    QWidget *launchWithWidget = NULL;
    ThumbnailWidget *thumbnailWidget = NULL;
@@ -348,15 +348,17 @@ static void* ui_companion_qt_init(void)
    helpMenu->addAction(QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT)) + "...", mainwindow, SLOT(showAbout()));
    helpMenu->addAction("About Qt...", qApp, SLOT(aboutQt()));
 
-   playlistWidget = new QWidget();
+   playlistWidget = new QFrame();
    playlistWidget->setLayout(new QVBoxLayout());
    playlistWidget->setObjectName("playlistWidget");
+   playlistWidget->layout()->setContentsMargins(0, 0, 0, 0);
 
    playlistWidget->layout()->addWidget(mainwindow->playlistListWidget());
 
-   browserWidget = new QWidget();
+   browserWidget = new QFrame();
    browserWidget->setLayout(new QVBoxLayout());
    browserWidget->setObjectName("browserWidget");
+   browserWidget->layout()->setContentsMargins(0, 0, 0, 0);
 
    browserDownloadsButton = new QPushButton(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY));
    browserUpButton = new QPushButton(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_TAB_FILE_BROWSER_UP));
diff --git a/ui/drivers/ui_qt.h b/ui/drivers/ui_qt.h
index d3a331b447..3559a1339a 100644
--- a/ui/drivers/ui_qt.h
+++ b/ui/drivers/ui_qt.h
@@ -576,7 +576,7 @@ private:
    CoreInfoLabel *m_coreInfoLabel;
    CoreInfoWidget *m_coreInfoWidget;
    QDockWidget *m_logDock;
-   QWidget *m_logWidget;
+   QFrame *m_logWidget;
    LogTextEdit *m_logTextEdit;
    QVector<QByteArray> m_imageFormats;
    QListWidgetItem *m_historyPlaylistsItem;