[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gwenview] app: Improve background color code for URL Navigator and adjacent fullscreen toolbars
From:       Henrik Fehlauer <null () kde ! org>
Date:       2018-02-28 23:02:34
Message-ID: E1erAk6-0005zW-Hp () code ! kde ! org
[Download RAW message or body]

Git commit ad2404cfc533da2bd88d857f67837d9d901eef1c by Henrik Fehlauer, on behalf of Huon Imberger.
Committed on 28/02/2018 at 23:02.
Pushed by rkflx into branch 'master'.

Improve background color code for URL Navigator and adjacent fullscreen toolbars

Summary:
Similar to {D10781}, modifying background role to get a dark background instead of
manually adjusting palette is a preferred solution. This way the palette is still
inherited so does not need to be continually adjusted when the overall palette
changes, like when switching to/from fullscreen.

This also makes the entire fullscreen toolbar (including URL nav) have a consistent background color

Fullscreen left edge before:
{F5731730}

Fullscreen left edge after:
{F5731731}

Fullscreen right edge before:
{F5731732}

Fullscreen right edge after:
{F5731733}

Test Plan:
In {nav Browse}, the URL Navigator should have a darker background color than the rest of the UI.

In {nav Fullscreen} {nav Browse}, the entire toolbar should have a consistent, dark, background color.

Reviewers: #gwenview, rkflx, ngraham

Reviewed By: #gwenview, rkflx, ngraham

Subscribers: ngraham

Differential Revision: https://phabricator.kde.org/D10880

M  +5    -9    app/browsemainpage.cpp

https://commits.kde.org/gwenview/ad2404cfc533da2bd88d857f67837d9d901eef1c

diff --git a/app/browsemainpage.cpp b/app/browsemainpage.cpp
index 32c70e9c..ffec371d 100644
--- a/app/browsemainpage.cpp
+++ b/app/browsemainpage.cpp
@@ -94,16 +94,20 @@ struct BrowseMainPagePrivate : public Ui_BrowseMainPage
         mFilePlacesModel = new KFilePlacesModel(q);
         mUrlNavigator = new KUrlNavigator(mFilePlacesModel, QUrl(), mUrlNavigatorContainer);
         mUrlNavigatorContainer->setAutoFillBackground(true);
+        mUrlNavigatorContainer->setBackgroundRole(QPalette::Mid);
         QVBoxLayout* layout = new QVBoxLayout(mUrlNavigatorContainer);
         layout->setMargin(0);
         layout->addWidget(mUrlNavigator);
         QObject::connect(mUrlNavigator, SIGNAL(urlsDropped(QUrl,QDropEvent*)),
                          q, SLOT(slotUrlsDropped(QUrl,QDropEvent*)));
-        updateUrlNavigatorBackgroundColor();
 
         // FullScreen Toolbar
         mFullScreenToolBar->setVisible(false);
         mFullScreenToolBar2->setVisible(false);
+        mFullScreenToolBar->setAutoFillBackground(true);
+        mFullScreenToolBar2->setAutoFillBackground(true);
+        mFullScreenToolBar->setBackgroundRole(QPalette::Mid);
+        mFullScreenToolBar2->setBackgroundRole(QPalette::Mid);
 
         // Thumbnail slider
         QObject::connect(mThumbnailSlider, SIGNAL(valueChanged(int)),
@@ -213,13 +217,6 @@ struct BrowseMainPagePrivate : public Ui_BrowseMainPage
         return count;
     }
 
-    void updateUrlNavigatorBackgroundColor()
-    {
-       QPalette pal(q->palette());
-       pal.setColor(QPalette::Window, pal.color(QPalette::Window).dark(110));
-       mUrlNavigatorContainer->setPalette(pal);
-    }
-
     void updateContextBarActions()
     {
         PreviewItemDelegate::ContextBarActions actions;
@@ -402,7 +399,6 @@ void BrowseMainPage::updateThumbnailDetails()
 void BrowseMainPage::setFullScreenMode(bool fullScreen)
 {
     d->applyPalette(fullScreen);
-    d->updateUrlNavigatorBackgroundColor();
     d->mUrlNavigatorContainer->setContentsMargins(
         fullScreen ? 6 : 0,
         0, 0, 0);
[prev in list] [next in list] [prev in thread] [next in thread]