feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.14' into 4.15

Browse Source 
Change-Id: Ifbfb495fff50b5bb27a12b204653cf1697820913
This commit is contained in:
Eike Ziller
2021-03-05 17:18:43 +01:00
parent 88d1708018 28f53a9040
commit fee671dfbe
8 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/iwelcomepage.cpp
View File

@@ -57,7 +57,7 @@ IWelcomePage::~IWelcomePage()
g_welcomePages.removeOne(this);
}
static QPalette buttonPalette(bool isActive, bool isCursorInside, bool forText)
QPalette WelcomePageFrame::buttonPalette(bool isActive, bool isCursorInside, bool forText)
{
QPalette pal;
Theme *theme = Utils::creatorTheme();
@@ -174,8 +174,8 @@ bool WelcomePageButtonPrivate::isActive() const
void WelcomePageButtonPrivate::doUpdate(bool cursorInside)
{
const bool active = isActive();
q->setPalette(buttonPalette(active, cursorInside, false));
const QPalette lpal = buttonPalette(active, cursorInside, true);
q->setPalette(WelcomePageFrame::buttonPalette(active, cursorInside, false));
const QPalette lpal = WelcomePageFrame::buttonPalette(active, cursorInside, true);
m_label->setPalette(lpal);
if (m_icon)
m_icon->setPalette(lpal);