Skip to content

Commit f35d2bd

Browse files
author
Uwe Kindler
committed
Some renaming of color schem functions to shorten the names a little bit
1 parent 780dea8 commit f35d2bd

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/DockManager.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ struct DockManagerPrivate
119119
QMap<QString, QMenu*> ViewMenuGroups;
120120
QMenu* ViewMenu;
121121
CDockManager::eViewMenuInsertionOrder MenuInsertionOrder = CDockManager::MenuAlphabeticallySorted;
122-
CDockManager::eStylesheetColorSchemeBehavior StylesheetColorSchemeBehavior = CDockManager::FollowApplicationPalette;
122+
CDockManager::ColorSchemeMode ColorSchemeMode = CDockManager::ColorSchemeMode::FollowPalette;
123123
bool RestoringState = false;
124124
QVector<CFloatingDockContainer*> UninitializedFloatingWidgets;
125125
CDockFocusController* FocusController = nullptr;
@@ -756,7 +756,7 @@ bool CDockManager::eventFilter(QObject *obj, QEvent *e)
756756
}
757757
}
758758
#endif
759-
if (e->type() == QEvent::ApplicationPaletteChange && d->StylesheetColorSchemeBehavior == CDockManager::FollowApplicationPalette)
759+
if (e->type() == QEvent::ApplicationPaletteChange && d->ColorSchemeMode == CDockManager::ColorSchemeMode::FollowPalette)
760760
{
761761
if (d->CurrentStylesheetDark != isDesiredStylesheetDark()) {
762762
d->loadStylesheet();
@@ -1312,9 +1312,9 @@ void CDockManager::setViewMenuInsertionOrder(eViewMenuInsertionOrder Order)
13121312

13131313

13141314
//============================================================================
1315-
void CDockManager::setStylesheetColorSchemeBehavior(eStylesheetColorSchemeBehavior Behavior)
1315+
void CDockManager::setColorSchemeMode(ColorSchemeMode Mode)
13161316
{
1317-
d->StylesheetColorSchemeBehavior = Behavior;
1317+
d->ColorSchemeMode = Mode;
13181318

13191319
if (d->CurrentStylesheetDark != isDesiredStylesheetDark()) {
13201320
d->loadStylesheet();
@@ -1651,7 +1651,7 @@ bool CDockManager::isApplicationPaletteDark()
16511651
//============================================================================
16521652
bool CDockManager::isDesiredStylesheetDark()
16531653
{
1654-
return ((isApplicationPaletteDark() && d->StylesheetColorSchemeBehavior == FollowApplicationPalette) || d->StylesheetColorSchemeBehavior == ForceDark);
1654+
return ((isApplicationPaletteDark() && d->ColorSchemeMode == ColorSchemeMode::FollowPalette) || d->ColorSchemeMode == ColorSchemeMode::Dark);
16551655
}
16561656

16571657

src/DockManager.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@ public Q_SLOTS:
187187
MenuAlphabeticallySorted
188188
};
189189

190-
enum eStylesheetColorSchemeBehavior
190+
enum class ColorSchemeMode
191191
{
192-
ForceLight,
193-
ForceDark,
194-
FollowApplicationPalette
192+
Light,
193+
Dark,
194+
FollowPalette
195195
};
196196

197197
/**
@@ -651,7 +651,7 @@ public Q_SLOTS:
651651
* palette change propagation. They are implemented solely
652652
* for compatibility reasons and manual stylesheet switching.
653653
*/
654-
void setStylesheetColorSchemeBehavior(eStylesheetColorSchemeBehavior Behavior);
654+
void setColorSchemeMode(ColorSchemeMode Mode);
655655

656656
/**
657657
* This function returns true between the restoringState() and

0 commit comments

Comments
 (0)