napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AOSC-Dev/calamares into AOSC-Dev-master

Browse Source
This commit is contained in:
Adriaan de Groot 2017-06-08 04:54:06 -04:00
commit 14912d6c63
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calamares/progresstree/ProgressTreeDelegate.cpp
View File

@ -104,7 +104,8 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
{ {
painter->setPen( Calamares::Branding::instance()-> painter->setPen( Calamares::Branding::instance()->
styleString( Calamares::Branding::SidebarTextSelect ) ); 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() ); painter->fillRect( option.rect, painter->brush().color() );

3
src/libcalamaresui/Branding.cpp
View File

@ -71,7 +71,8 @@ const QStringList Branding::s_styleEntryStrings =
{ {
"sidebarBackground", "sidebarBackground",
"sidebarText", "sidebarText",
"sidebarTextSelect" "sidebarTextSelect",
"sidebarTextHighlight"
}; };

3
src/libcalamaresui/Branding.h
View File

@ -62,7 +62,8 @@ public:
{ {
SidebarBackground, SidebarBackground,
SidebarText, SidebarText,
SidebarTextSelect SidebarTextSelect,
SidebarTextHighlight
}; };
static Branding* instance(); static Branding* instance();