From 2d641101502e0455625c436f574077aec45076cc Mon Sep 17 00:00:00 2001
From: Mingcong Bai <jeffbai@aosc.xyz>
Date: Wed, 6 Jan 2016 20:02:56 -0700
Subject: [PATCH 1/3] calamares: sidebarTextHighlight for branding

This commit adds support for distribution to define sidebarTextHighlight to their
branding.desc file, to control the left panel (sidebar) with highlight behind the
current step (isCurrent) text label.
---
 src/calamares/progresstree/ProgressTreeDelegate.cpp | 3 ++-
 src/libcalamaresui/Branding.cpp                     | 3 ++-
 src/libcalamaresui/Branding.h                       | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index 4b2ab65bb..e9f56e23f 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -104,7 +104,8 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
     {
         painter->setPen( Calamares::Branding::instance()->
                          styleString( Calamares::Branding::SidebarTextSelect ) );
-        painter->setBrush( APP->mainWindow()->palette().background() );
+        painter->setBrush( QColor( Calamares::Branding::instance()->
+                           styleString( Calamares::Branding::SidebarTextHighlight ) ) );
     }
 
     painter->fillRect( option.rect, painter->brush().color() );
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index b6cf09321..08e9c1709 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -71,7 +71,8 @@ QStringList Branding::s_styleEntryStrings =
 {
     "sidebarBackground",
     "sidebarText",
-    "sidebarTextSelect"
+    "sidebarTextSelect",
+    "sidebarTextHighlight"
 };
 
 
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index 45afc8531..c65d48aaf 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -62,7 +62,8 @@ public:
     {
         SidebarBackground,
         SidebarText,
-        SidebarTextSelect
+        SidebarTextSelect,
+        SidebarTextHighlight
     };
 
     static Branding* instance();

From daf5b025cedd2c2f245ecd6105fe20cc556bf9d3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 8 Jun 2017 06:17:24 -0400
Subject: [PATCH 2/3] Branding: fall back to original app palette

---
 src/calamares/progresstree/ProgressTreeDelegate.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index e9f56e23f..1073b63ae 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -104,8 +104,12 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
     {
         painter->setPen( Calamares::Branding::instance()->
                          styleString( Calamares::Branding::SidebarTextSelect ) );
-        painter->setBrush( QColor( Calamares::Branding::instance()->
-                           styleString( Calamares::Branding::SidebarTextHighlight ) ) );
+        QString textHighlight = Calamares::Branding::instance()->
+                           styleString( Calamares::Branding::SidebarTextHighlight );
+        if ( textHighlight.isEmpty() )
+            painter->setBrush( APP->mainWindow()->palette().background() );
+        else
+            painter->setBrush( QColor( textHighlight ) );
     }
 
     painter->fillRect( option.rect, painter->brush().color() );

From bfe7334812641c8d4c26443589282c81ee1a34ab Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 8 Jun 2017 06:21:06 -0400
Subject: [PATCH 3/3] Branding: add example setting, document fallback behavior

---
 src/branding/default/branding.desc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc
index 4c14c9cae..1334bec7a 100644
--- a/src/branding/default/branding.desc
+++ b/src/branding/default/branding.desc
@@ -1,3 +1,4 @@
+# style.sidebarTextHighlight is optional and defaults to application palette
 ---
 componentName:  default
 
@@ -25,3 +26,4 @@ style:
    sidebarBackground:    "#292F34"
    sidebarText:          "#FFFFFF"
    sidebarTextSelect:    "#292F34"
+   sidebarTextHighlight: "#D35400"