diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-14 14:56:00 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-15 13:00:53 +0000 |
commit | 87d3e84c75839b736d45f2773fc5fb4ecce14296 (patch) | |
tree | d580764ae48ed0226763b9ad56a12c566acd8a75 /src/quicktemplates2 | |
parent | 6d879ab06a95d6b49e5ca4ad0af12024d5d2a988 (diff) |
Add QQuickTheme::Scope
Replace the old enums that were originally copied from QPlatformTheme,
including irrelevant entries for DockWidget, MdiSubWindow, MessageBox,
with a unified enum that will be matched to cover everything needed
for theming fonts and palettes for Qt Quick Controls 2.
Task-number: QTBUG-67062
Change-Id: Ia99d092f28c00210c0c7f24d4241eb5a5d9ceb5b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
43 files changed, 193 insertions, 159 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 370f47bb..edbc9e91 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -274,7 +274,7 @@ void QQuickApplicationWindowPrivate::updateFont(const QFont &f) void QQuickApplicationWindowPrivate::resolveFont() { - QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::SystemFont)); + QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::System)); setFont_helper(resolvedFont); } @@ -296,7 +296,7 @@ void QQuickApplicationWindowPrivate::updatePalette(const QPalette &p) void QQuickApplicationWindowPrivate::resolvePalette() { - QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::SystemPalette)); + QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::System)); setPalette_helper(resolvedPalette); } @@ -691,7 +691,7 @@ void QQuickApplicationWindow::setFont(const QFont &font) if (d->font.resolve() == font.resolve() && d->font == font) return; - QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::SystemFont)); + QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::System)); d->setFont_helper(resolvedFont); } @@ -770,7 +770,7 @@ void QQuickApplicationWindow::setPalette(const QPalette &palette) if (d->palette.resolve() == palette.resolve() && d->palette == palette) return; - QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::SystemPalette)); + QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::System)); d->setPalette_helper(resolvedPalette); } diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp index f50736f1..ce8cede7 100644 --- a/src/quicktemplates2/qquickbutton.cpp +++ b/src/quicktemplates2/qquickbutton.cpp @@ -102,12 +102,12 @@ QQuickButton::QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent) QFont QQuickButton::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::PushButtonFont); + return QQuickTheme::themeFont(QQuickTheme::Button); } QPalette QQuickButton::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::ButtonPalette); + return QQuickTheme::themePalette(QQuickTheme::Button); } /*! diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp index e1ca675e..cb2e62e7 100644 --- a/src/quicktemplates2/qquickcheckbox.cpp +++ b/src/quicktemplates2/qquickcheckbox.cpp @@ -189,12 +189,12 @@ void QQuickCheckBox::setCheckState(Qt::CheckState state) QFont QQuickCheckBox::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::CheckBoxFont); + return QQuickTheme::themeFont(QQuickTheme::CheckBox); } QPalette QQuickCheckBox::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::CheckBoxPalette); + return QQuickTheme::themePalette(QQuickTheme::CheckBox); } void QQuickCheckBox::buttonChange(ButtonChange change) diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp index 9d892154..35de80ec 100644 --- a/src/quicktemplates2/qquickcheckdelegate.cpp +++ b/src/quicktemplates2/qquickcheckdelegate.cpp @@ -176,7 +176,12 @@ void QQuickCheckDelegate::setCheckState(Qt::CheckState state) QFont QQuickCheckDelegate::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::ListViewFont); + return QQuickTheme::themeFont(QQuickTheme::ListView); +} + +QPalette QQuickCheckDelegate::defaultPalette() const +{ + return QQuickTheme::themePalette(QQuickTheme::ListView); } void QQuickCheckDelegate::buttonChange(ButtonChange change) diff --git a/src/quicktemplates2/qquickcheckdelegate_p.h b/src/quicktemplates2/qquickcheckdelegate_p.h index 67dcf706..2d5a5cb2 100644 --- a/src/quicktemplates2/qquickcheckdelegate_p.h +++ b/src/quicktemplates2/qquickcheckdelegate_p.h @@ -79,6 +79,7 @@ Q_SIGNALS: protected: QFont defaultFont() const override; + QPalette defaultPalette() const override; void buttonChange(ButtonChange change) override; void nextCheckState() override; diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 28d3506f..3616bcc2 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -1705,12 +1705,12 @@ void QQuickComboBox::localeChange(const QLocale &newLocale, const QLocale &oldLo QFont QQuickComboBox::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::ComboMenuItemFont); + return QQuickTheme::themeFont(QQuickTheme::ComboBox); } QPalette QQuickComboBox::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::ComboBoxPalette); + return QQuickTheme::themePalette(QQuickTheme::ComboBox); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 03a92b00..fbe46206 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -397,7 +397,7 @@ QFont QQuickControlPrivate::parentFont(const QQuickItem *item) if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window())) return window->font(); - return QQuickTheme::themeFont(QQuickTheme::SystemFont); + return QQuickTheme::themeFont(QQuickTheme::System); } /*! @@ -488,7 +488,7 @@ QPalette QQuickControlPrivate::parentPalette(const QQuickItem *item) if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window())) return window->palette(); - return QQuickTheme::themePalette(QQuickTheme::SystemPalette); + return QQuickTheme::themePalette(QQuickTheme::System); } /*! @@ -1540,12 +1540,12 @@ void QQuickControl::componentComplete() QFont QQuickControl::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::SystemFont); + return QQuickTheme::themeFont(QQuickTheme::System); } QPalette QQuickControl::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::SystemPalette); + return QQuickTheme::themePalette(QQuickTheme::System); } void QQuickControl::focusInEvent(QFocusEvent *event) diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates2/qquickdelaybutton.cpp index 79bd738f..02efc3a2 100644 --- a/src/quicktemplates2/qquickdelaybutton.cpp +++ b/src/quicktemplates2/qquickdelaybutton.cpp @@ -265,12 +265,12 @@ void QQuickDelayButton::nextCheckState() QFont QQuickDelayButton::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::PushButtonFont); + return QQuickTheme::themeFont(QQuickTheme::Button); } QPalette QQuickDelayButton::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::ButtonPalette); + return QQuickTheme::themePalette(QQuickTheme::Button); } QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp index 4a8420b2..cc74cce9 100644 --- a/src/quicktemplates2/qquickgroupbox.cpp +++ b/src/quicktemplates2/qquickgroupbox.cpp @@ -189,12 +189,12 @@ void QQuickGroupBox::componentComplete() QFont QQuickGroupBox::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::GroupBoxTitleFont); + return QQuickTheme::themeFont(QQuickTheme::GroupBox); } QPalette QQuickGroupBox::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::GroupBoxPalette); + return QQuickTheme::themePalette(QQuickTheme::GroupBox); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp index ac29936c..145eaaf4 100644 --- a/src/quicktemplates2/qquickitemdelegate.cpp +++ b/src/quicktemplates2/qquickitemdelegate.cpp @@ -122,12 +122,12 @@ void QQuickItemDelegate::setHighlighted(bool highlighted) QFont QQuickItemDelegate::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::ItemViewFont); + return QQuickTheme::themeFont(QQuickTheme::ItemView); } QPalette QQuickItemDelegate::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::ItemViewPalette); + return QQuickTheme::themePalette(QQuickTheme::ItemView); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index 7a4ea8df..ad90a727 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -113,7 +113,7 @@ void QQuickLabelPrivate::inheritFont(const QFont &font) QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font; parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve()); - const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::LabelFont); + const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::Label); const QFont resolvedFont = parentFont.resolve(defaultFont); setFont_helper(resolvedFont); @@ -155,7 +155,7 @@ void QQuickLabelPrivate::inheritPalette(const QPalette &palette) QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette; parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve()); - const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::LabelPalette); + const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::Label); const QPalette resolvedPalette = parentPalette.resolve(defaultPalette); setPalette_helper(resolvedPalette); diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index cd3b9db6..4e334bba 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -1432,12 +1432,12 @@ void QQuickMenu::timerEvent(QTimerEvent *event) QFont QQuickMenu::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::MenuFont); + return QQuickTheme::themeFont(QQuickTheme::Menu); } QPalette QQuickMenu::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::MenuPalette); + return QQuickTheme::themePalette(QQuickTheme::Menu); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp index ee3d49f3..9bd0ea9a 100644 --- a/src/quicktemplates2/qquickmenubar.cpp +++ b/src/quicktemplates2/qquickmenubar.cpp @@ -643,12 +643,12 @@ void QQuickMenuBar::itemRemoved(int index, QQuickItem *item) QFont QQuickMenuBar::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::MenuBarFont); + return QQuickTheme::themeFont(QQuickTheme::MenuBar); } QPalette QQuickMenuBar::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::MenuBarPalette); + return QQuickTheme::themePalette(QQuickTheme::MenuBar); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickmenubaritem.cpp b/src/quicktemplates2/qquickmenubaritem.cpp index aa4f869a..863e88e3 100644 --- a/src/quicktemplates2/qquickmenubaritem.cpp +++ b/src/quicktemplates2/qquickmenubaritem.cpp @@ -167,12 +167,12 @@ void QQuickMenuBarItem::geometryChanged(const QRectF &newGeometry, const QRectF QFont QQuickMenuBarItem::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::MenuBarFont); + return QQuickTheme::themeFont(QQuickTheme::MenuBar); } QPalette QQuickMenuBarItem::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::MenuBarPalette); + return QQuickTheme::themePalette(QQuickTheme::MenuBar); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp index 318416ce..ca74dd60 100644 --- a/src/quicktemplates2/qquickmenuitem.cpp +++ b/src/quicktemplates2/qquickmenuitem.cpp @@ -264,12 +264,12 @@ void QQuickMenuItem::componentComplete() QFont QQuickMenuItem::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::MenuItemFont); + return QQuickTheme::themeFont(QQuickTheme::Menu); } QPalette QQuickMenuItem::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::MenuPalette); + return QQuickTheme::themePalette(QQuickTheme::Menu); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates2/qquickmenuseparator.cpp index 7b30c009..1e7c58c6 100644 --- a/src/quicktemplates2/qquickmenuseparator.cpp +++ b/src/quicktemplates2/qquickmenuseparator.cpp @@ -71,9 +71,14 @@ QQuickMenuSeparator::QQuickMenuSeparator(QQuickItem *parent) { } +QFont QQuickMenuSeparator::defaultFont() const +{ + return QQuickTheme::themeFont(QQuickTheme::Menu); +} + QPalette QQuickMenuSeparator::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::MenuPalette); + return QQuickTheme::themePalette(QQuickTheme::Menu); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickmenuseparator_p.h b/src/quicktemplates2/qquickmenuseparator_p.h index 002b68ba..1e687fd0 100644 --- a/src/quicktemplates2/qquickmenuseparator_p.h +++ b/src/quicktemplates2/qquickmenuseparator_p.h @@ -60,6 +60,7 @@ public: explicit QQuickMenuSeparator(QQuickItem *parent = nullptr); protected: + QFont defaultFont() const override; QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index c21b8b68..84b17d65 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -2425,12 +2425,12 @@ void QQuickPopup::spacingChange(qreal newSpacing, qreal oldSpacing) QFont QQuickPopup::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::SystemFont); + return QQuickTheme::themeFont(QQuickTheme::System); } QPalette QQuickPopup::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::SystemPalette); + return QQuickTheme::themePalette(QQuickTheme::System); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index 5c906312..f89b057d 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -97,7 +97,7 @@ void QQuickPopupItemPrivate::resolveFont() if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window())) inheritFont(window->font()); else - inheritFont(QQuickTheme::themeFont(QQuickTheme::SystemFont)); + inheritFont(QQuickTheme::themeFont(QQuickTheme::System)); } void QQuickPopupItemPrivate::resolvePalette() @@ -105,7 +105,7 @@ void QQuickPopupItemPrivate::resolvePalette() if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window())) inheritPalette(window->palette()); else - inheritPalette(QQuickTheme::themePalette(QQuickTheme::SystemPalette)); + inheritPalette(QQuickTheme::themePalette(QQuickTheme::System)); } QQuickItem *QQuickPopupItemPrivate::getContentItem() diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp index 1d6f6771..31aa4be9 100644 --- a/src/quicktemplates2/qquickradiobutton.cpp +++ b/src/quicktemplates2/qquickradiobutton.cpp @@ -99,12 +99,12 @@ QQuickRadioButton::QQuickRadioButton(QQuickItem *parent) QFont QQuickRadioButton::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::RadioButtonFont); + return QQuickTheme::themeFont(QQuickTheme::RadioButton); } QPalette QQuickRadioButton::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::RadioButtonPalette); + return QQuickTheme::themePalette(QQuickTheme::RadioButton); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp index fb55ba7c..12cb0d08 100644 --- a/src/quicktemplates2/qquickradiodelegate.cpp +++ b/src/quicktemplates2/qquickradiodelegate.cpp @@ -100,7 +100,12 @@ QQuickRadioDelegate::QQuickRadioDelegate(QQuickItem *parent) QFont QQuickRadioDelegate::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::ListViewFont); + return QQuickTheme::themeFont(QQuickTheme::ListView); +} + +QPalette QQuickRadioDelegate::defaultPalette() const +{ + return QQuickTheme::themePalette(QQuickTheme::ListView); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickradiodelegate_p.h b/src/quicktemplates2/qquickradiodelegate_p.h index 4db9959d..453856e4 100644 --- a/src/quicktemplates2/qquickradiodelegate_p.h +++ b/src/quicktemplates2/qquickradiodelegate_p.h @@ -63,6 +63,7 @@ public: protected: QFont defaultFont() const override; + QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 93cb3261..75ba52a1 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -1024,12 +1024,12 @@ void QQuickSpinBox::localeChange(const QLocale &newLocale, const QLocale &oldLoc QFont QQuickSpinBox::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::SpinBoxFont); + return QQuickTheme::themeFont(QQuickTheme::SpinBox); } QPalette QQuickSpinBox::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::SpinBoxPalette); + return QQuickTheme::themePalette(QQuickTheme::SpinBox); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index 6c3d804b..9df361ee 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -1230,7 +1230,12 @@ void QQuickSwipeDelegate::geometryChanged(const QRectF &newGeometry, const QRect QFont QQuickSwipeDelegate::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::ListViewFont); + return QQuickTheme::themeFont(QQuickTheme::ListView); +} + +QPalette QQuickSwipeDelegate::defaultPalette() const +{ + return QQuickTheme::themePalette(QQuickTheme::ListView); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquickswipedelegate_p.h b/src/quicktemplates2/qquickswipedelegate_p.h index a9900eb8..ad840097 100644 --- a/src/quicktemplates2/qquickswipedelegate_p.h +++ b/src/quicktemplates2/qquickswipedelegate_p.h @@ -82,6 +82,7 @@ protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; QFont defaultFont() const override; + QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp index 5e3ccbc9..3093b334 100644 --- a/src/quicktemplates2/qquickswitch.cpp +++ b/src/quicktemplates2/qquickswitch.cpp @@ -233,12 +233,12 @@ void QQuickSwitch::buttonChange(ButtonChange change) QFont QQuickSwitch::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::SwitchFont); + return QQuickTheme::themeFont(QQuickTheme::Switch); } QPalette QQuickSwitch::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::SwitchPalette); + return QQuickTheme::themePalette(QQuickTheme::Switch); } QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp index 8b673662..3ba859f5 100644 --- a/src/quicktemplates2/qquickswitchdelegate.cpp +++ b/src/quicktemplates2/qquickswitchdelegate.cpp @@ -202,7 +202,12 @@ void QQuickSwitchDelegate::touchEvent(QTouchEvent *event) QFont QQuickSwitchDelegate::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::ListViewFont); + return QQuickTheme::themeFont(QQuickTheme::ListView); +} + +QPalette QQuickSwitchDelegate::defaultPalette() const +{ + return QQuickTheme::themePalette(QQuickTheme::ListView); } void QQuickSwitchDelegate::mirrorChange() diff --git a/src/quicktemplates2/qquickswitchdelegate_p.h b/src/quicktemplates2/qquickswitchdelegate_p.h index 973ec21d..1fb35aea 100644 --- a/src/quicktemplates2/qquickswitchdelegate_p.h +++ b/src/quicktemplates2/qquickswitchdelegate_p.h @@ -79,6 +79,8 @@ protected: #endif QFont defaultFont() const override; + QPalette defaultPalette() const override; + void mirrorChange() override; void nextCheckState() override; diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp index e2cd06fc..6d4b8602 100644 --- a/src/quicktemplates2/qquicktabbar.cpp +++ b/src/quicktemplates2/qquicktabbar.cpp @@ -441,9 +441,14 @@ void QQuickTabBar::itemRemoved(int index, QQuickItem *item) polish(); } +QFont QQuickTabBar::defaultFont() const +{ + return QQuickTheme::themeFont(QQuickTheme::TabBar); +} + QPalette QQuickTabBar::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::TabBarPalette); + return QQuickTheme::themePalette(QQuickTheme::TabBar); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquicktabbar_p.h b/src/quicktemplates2/qquicktabbar_p.h index f0299bd5..e87ae133 100644 --- a/src/quicktemplates2/qquicktabbar_p.h +++ b/src/quicktemplates2/qquicktabbar_p.h @@ -102,6 +102,7 @@ protected: void itemMoved(int index, QQuickItem *item) override; void itemRemoved(int index, QQuickItem *item) override; + QFont defaultFont() const override; QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp index 59905a63..597f4a5e 100644 --- a/src/quicktemplates2/qquicktabbutton.cpp +++ b/src/quicktemplates2/qquicktabbutton.cpp @@ -72,12 +72,12 @@ QQuickTabButton::QQuickTabButton(QQuickItem *parent) QFont QQuickTabButton::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::TabButtonFont); + return QQuickTheme::themeFont(QQuickTheme::TabBar); } QPalette QQuickTabButton::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::TabBarPalette); + return QQuickTheme::themePalette(QQuickTheme::TabBar); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index fb724225..a13213fd 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -194,7 +194,7 @@ void QQuickTextAreaPrivate::inheritFont(const QFont &font) QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font; parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve()); - const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::EditorFont); + const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::TextArea); const QFont resolvedFont = parentFont.resolve(defaultFont); setFont_helper(resolvedFont); @@ -236,7 +236,7 @@ void QQuickTextAreaPrivate::inheritPalette(const QPalette &palette) QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette; parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve()); - const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::TextEditPalette); + const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::TextArea); const QPalette resolvedPalette = parentPalette.resolve(defaultPalette); setPalette_helper(resolvedPalette); diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 385ea48e..65ffb7d9 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -168,7 +168,7 @@ void QQuickTextFieldPrivate::inheritFont(const QFont &font) QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font; parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve()); - const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::EditorFont); + const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::TextField); const QFont resolvedFont = parentFont.resolve(defaultFont); setFont_helper(resolvedFont); @@ -210,7 +210,7 @@ void QQuickTextFieldPrivate::inheritPalette(const QPalette &palette) QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette; parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve()); - const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::TextLineEditPalette); + const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::TextField); const QPalette resolvedPalette = parentPalette.resolve(defaultPalette); setPalette_helper(resolvedPalette); diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp index 41d15014..30185fe2 100644 --- a/src/quicktemplates2/qquicktheme.cpp +++ b/src/quicktemplates2/qquicktheme.cpp @@ -44,35 +44,57 @@ QT_BEGIN_NAMESPACE QScopedPointer<QQuickTheme> QQuickThemePrivate::current; -static QPlatformTheme::Font platformFont(QQuickTheme::Font type) +static QPlatformTheme::Font platformFont(QQuickTheme::Scope scope) { - switch (type) { - case QQuickTheme::SpinBoxFont: - return QPlatformTheme::EditorFont; - case QQuickTheme::SwitchFont: - return QPlatformTheme::CheckBoxFont; - case QQuickTheme::TumblerFont: - return QPlatformTheme::ItemViewFont; - default: - return static_cast<QPlatformTheme::Font>(type); + switch (scope) { + case QQuickTheme::Button: return QPlatformTheme::PushButtonFont; + case QQuickTheme::CheckBox: return QPlatformTheme::CheckBoxFont; + case QQuickTheme::ComboBox: return QPlatformTheme::ComboMenuItemFont; + case QQuickTheme::GroupBox: return QPlatformTheme::GroupBoxTitleFont; + case QQuickTheme::ItemView: return QPlatformTheme::ItemViewFont; + case QQuickTheme::Label: return QPlatformTheme::LabelFont; + case QQuickTheme::ListView: return QPlatformTheme::ListViewFont; + case QQuickTheme::Menu: return QPlatformTheme::MenuFont; + case QQuickTheme::MenuBar: return QPlatformTheme::MenuBarFont; + case QQuickTheme::RadioButton: return QPlatformTheme::RadioButtonFont; + case QQuickTheme::SpinBox: return QPlatformTheme::EditorFont; + case QQuickTheme::Switch: return QPlatformTheme::CheckBoxFont; + case QQuickTheme::TabBar: return QPlatformTheme::TabButtonFont; + case QQuickTheme::TextArea: return QPlatformTheme::EditorFont; + case QQuickTheme::TextField: return QPlatformTheme::EditorFont; + case QQuickTheme::ToolBar: return QPlatformTheme::ToolButtonFont; + case QQuickTheme::ToolTip: return QPlatformTheme::TipLabelFont; + case QQuickTheme::Tumbler: return QPlatformTheme::ItemViewFont; + default: return QPlatformTheme::SystemFont; } } -static QPlatformTheme::Palette platformPalette(QQuickTheme::Palette type) +static QPlatformTheme::Palette platformPalette(QQuickTheme::Scope scope) { - switch (type) { - case QQuickTheme::SpinBoxPalette: - return QPlatformTheme::TextLineEditPalette; - case QQuickTheme::SwitchPalette: - return QPlatformTheme::CheckBoxPalette; - case QQuickTheme::TumblerPalette: - return QPlatformTheme::ItemViewPalette; - default: - return static_cast<QPlatformTheme::Palette>(type); + switch (scope) { + case QQuickTheme::Button: return QPlatformTheme::ButtonPalette; + case QQuickTheme::CheckBox: return QPlatformTheme::CheckBoxPalette; + case QQuickTheme::ComboBox: return QPlatformTheme::ComboBoxPalette; + case QQuickTheme::GroupBox: return QPlatformTheme::GroupBoxPalette; + case QQuickTheme::ItemView: return QPlatformTheme::ItemViewPalette; + case QQuickTheme::Label: return QPlatformTheme::LabelPalette; + case QQuickTheme::ListView: return QPlatformTheme::ItemViewPalette; + case QQuickTheme::Menu: return QPlatformTheme::MenuPalette; + case QQuickTheme::MenuBar: return QPlatformTheme::MenuBarPalette; + case QQuickTheme::RadioButton: return QPlatformTheme::RadioButtonPalette; + case QQuickTheme::SpinBox: return QPlatformTheme::TextLineEditPalette; + case QQuickTheme::Switch: return QPlatformTheme::CheckBoxPalette; + case QQuickTheme::TabBar: return QPlatformTheme::TabBarPalette; + case QQuickTheme::TextArea: return QPlatformTheme::TextEditPalette; + case QQuickTheme::TextField: return QPlatformTheme::TextLineEditPalette; + case QQuickTheme::ToolBar: return QPlatformTheme::ToolButtonPalette; + case QQuickTheme::ToolTip: return QPlatformTheme::ToolTipPalette; + case QQuickTheme::Tumbler: return QPlatformTheme::ItemViewPalette; + default: return QPlatformTheme::SystemPalette; } } -const QFont *QQuickThemePrivate::resolveThemeFont(QQuickTheme::Font type) +const QFont *QQuickThemePrivate::resolveThemeFont(QQuickTheme::Scope scope) { Q_Q(QQuickTheme); if (!hasResolvedFonts) { @@ -80,10 +102,10 @@ const QFont *QQuickThemePrivate::resolveThemeFont(QQuickTheme::Font type) hasResolvedFonts = true; defaultFont.reset(); } - return q->font(type); + return q->font(scope); } -const QPalette *QQuickThemePrivate::resolveThemePalette(QQuickTheme::Palette type) +const QPalette *QQuickThemePrivate::resolveThemePalette(QQuickTheme::Scope scope) { Q_Q(QQuickTheme); if (!hasResolvedPalettes) { @@ -91,7 +113,7 @@ const QPalette *QQuickThemePrivate::resolveThemePalette(QQuickTheme::Palette typ hasResolvedPalettes = true; defaultPalette.reset(); } - return q->palette(type); + return q->palette(scope); } QQuickTheme::QQuickTheme() @@ -114,17 +136,17 @@ void QQuickTheme::setCurrent(QQuickTheme *theme) QQuickThemePrivate::current.reset(theme); } -QFont QQuickTheme::themeFont(Font type) +QFont QQuickTheme::themeFont(Scope scope) { const QFont *font = nullptr; if (QQuickTheme *theme = current()) - font = QQuickThemePrivate::get(theme)->resolveThemeFont(type); + font = QQuickThemePrivate::get(theme)->resolveThemeFont(scope); else if (QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) - font = theme->font(platformFont(type)); + font = theme->font(platformFont(scope)); if (font) { QFont f = *font; - if (type == SystemFont) + if (scope == System) f.resolve(0); return f; } @@ -132,17 +154,17 @@ QFont QQuickTheme::themeFont(Font type) return QFont(); } -QPalette QQuickTheme::themePalette(Palette type) +QPalette QQuickTheme::themePalette(Scope scope) { const QPalette *palette = nullptr; if (QQuickTheme *theme = current()) - palette = QQuickThemePrivate::get(theme)->resolveThemePalette(type); + palette = QQuickThemePrivate::get(theme)->resolveThemePalette(scope); else if (QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) - palette = theme->palette(platformPalette(type)); + palette = theme->palette(platformPalette(scope)); if (palette) { QPalette f = *palette; - if (type == SystemPalette) + if (scope == System) f.resolve(0); return f; } @@ -150,17 +172,17 @@ QPalette QQuickTheme::themePalette(Palette type) return QPalette(); } -const QFont *QQuickTheme::font(Font type) const +const QFont *QQuickTheme::font(Scope scope) const { Q_D(const QQuickTheme); - Q_UNUSED(type) + Q_UNUSED(scope) return d->defaultFont.data(); } -const QPalette *QQuickTheme::palette(Palette type) const +const QPalette *QQuickTheme::palette(Scope scope) const { Q_D(const QQuickTheme); - Q_UNUSED(type) + Q_UNUSED(scope) return d->defaultPalette.data(); } diff --git a/src/quicktemplates2/qquicktheme_p.h b/src/quicktemplates2/qquicktheme_p.h index f80bd9d7..32044b67 100644 --- a/src/quicktemplates2/qquicktheme_p.h +++ b/src/quicktemplates2/qquicktheme_p.h @@ -66,71 +66,34 @@ public: static QQuickTheme *current(); static void setCurrent(QQuickTheme *theme); - enum Font { - SystemFont, - MenuFont, - MenuBarFont, - MenuItemFont, - MessageBoxFont, - LabelFont, - TipLabelFont, - StatusBarFont, - TitleBarFont, - MdiSubWindowTitleFont, - DockWidgetTitleFont, - PushButtonFont, - CheckBoxFont, - RadioButtonFont, - ToolButtonFont, - ItemViewFont, - ListViewFont, - HeaderViewFont, - ListBoxFont, - ComboMenuItemFont, - ComboLineEditFont, - SmallFont, - MiniFont, - FixedFont, - GroupBoxTitleFont, - TabButtonFont, - EditorFont, - SwitchFont, - SpinBoxFont, - TumblerFont, - NFonts + enum Scope { + System, + Button, + CheckBox, + ComboBox, + GroupBox, + ItemView, + Label, + ListView, + Menu, + MenuBar, + RadioButton, + SpinBox, + Switch, + TabBar, + TextArea, + TextField, + ToolBar, + ToolTip, + Tumbler }; - enum Palette { - SystemPalette, - ToolTipPalette, - ToolButtonPalette, - ButtonPalette, - CheckBoxPalette, - RadioButtonPalette, - HeaderPalette, - ComboBoxPalette, - ItemViewPalette, - MessageBoxLabelPelette, - MessageBoxLabelPalette = MessageBoxLabelPelette, - TabBarPalette, - LabelPalette, - GroupBoxPalette, - MenuPalette, - MenuBarPalette, - TextEditPalette, - TextLineEditPalette, - SpinBoxPalette, - SwitchPalette, - TumblerPalette, - NPalettes - }; - - static QFont themeFont(Font type); - static QPalette themePalette(Palette type); + static QFont themeFont(Scope scope); + static QPalette themePalette(Scope scope); protected: - virtual const QFont *font(Font type) const; - virtual const QPalette *palette(Palette type) const; + virtual const QFont *font(Scope scope) const; + virtual const QPalette *palette(Scope scope) const; virtual void resolveFonts(const QFont &defaultFont); virtual void resolvePalettes(const QPalette &defaultPalette); diff --git a/src/quicktemplates2/qquicktheme_p_p.h b/src/quicktemplates2/qquicktheme_p_p.h index 88de14ab..e9593865 100644 --- a/src/quicktemplates2/qquicktheme_p_p.h +++ b/src/quicktemplates2/qquicktheme_p_p.h @@ -62,8 +62,8 @@ public: return theme->d_func(); } - const QFont *resolveThemeFont(QQuickTheme::Font type); - const QPalette *resolveThemePalette(QQuickTheme::Palette type); + const QFont *resolveThemeFont(QQuickTheme::Scope scope); + const QPalette *resolveThemePalette(QQuickTheme::Scope scope); static QScopedPointer<QQuickTheme> current; diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp index 77288547..c597de74 100644 --- a/src/quicktemplates2/qquicktoolbar.cpp +++ b/src/quicktemplates2/qquicktoolbar.cpp @@ -141,9 +141,14 @@ void QQuickToolBar::setPosition(Position position) emit positionChanged(); } +QFont QQuickToolBar::defaultFont() const +{ + return QQuickTheme::themeFont(QQuickTheme::ToolBar); +} + QPalette QQuickToolBar::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::ToolButtonPalette); + return QQuickTheme::themePalette(QQuickTheme::ToolBar); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquicktoolbar_p.h b/src/quicktemplates2/qquicktoolbar_p.h index b919c615..ef2ceb7e 100644 --- a/src/quicktemplates2/qquicktoolbar_p.h +++ b/src/quicktemplates2/qquicktoolbar_p.h @@ -75,6 +75,7 @@ Q_SIGNALS: void positionChanged(); protected: + QFont defaultFont() const override; QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp index 7a44792b..3a8aa7b3 100644 --- a/src/quicktemplates2/qquicktoolbutton.cpp +++ b/src/quicktemplates2/qquicktoolbutton.cpp @@ -71,12 +71,12 @@ QQuickToolButton::QQuickToolButton(QQuickItem *parent) QFont QQuickToolButton::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::ToolButtonFont); + return QQuickTheme::themeFont(QQuickTheme::ToolBar); } QPalette QQuickToolButton::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::ToolButtonPalette); + return QQuickTheme::themePalette(QQuickTheme::ToolBar); } QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquicktoolseparator.cpp b/src/quicktemplates2/qquicktoolseparator.cpp index 80d5fc86..2343c7ce 100644 --- a/src/quicktemplates2/qquicktoolseparator.cpp +++ b/src/quicktemplates2/qquicktoolseparator.cpp @@ -133,9 +133,14 @@ bool QQuickToolSeparator::isVertical() const return d->orientation == Qt::Vertical; } +QFont QQuickToolSeparator::defaultFont() const +{ + return QQuickTheme::themeFont(QQuickTheme::ToolBar); +} + QPalette QQuickToolSeparator::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::ToolButtonPalette); + return QQuickTheme::themePalette(QQuickTheme::ToolBar); } #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquicktoolseparator_p.h b/src/quicktemplates2/qquicktoolseparator_p.h index 2108cc5b..c3c14b82 100644 --- a/src/quicktemplates2/qquicktoolseparator_p.h +++ b/src/quicktemplates2/qquicktoolseparator_p.h @@ -74,6 +74,7 @@ Q_SIGNALS: void orientationChanged(); protected: + QFont defaultFont() const override; QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index b186d2b0..66fe9afe 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -303,12 +303,12 @@ void QQuickToolTip::hide() QFont QQuickToolTip::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::TipLabelFont); + return QQuickTheme::themeFont(QQuickTheme::ToolTip); } QPalette QQuickToolTip::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::ToolTipPalette); + return QQuickTheme::themePalette(QQuickTheme::ToolTip); } void QQuickToolTip::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp index f2797c29..4dc294e7 100644 --- a/src/quicktemplates2/qquicktumbler.cpp +++ b/src/quicktemplates2/qquicktumbler.cpp @@ -830,12 +830,12 @@ void QQuickTumbler::updatePolish() QFont QQuickTumbler::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::TumblerFont); + return QQuickTheme::themeFont(QQuickTheme::Tumbler); } QPalette QQuickTumbler::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::TumblerPalette); + return QQuickTheme::themePalette(QQuickTheme::Tumbler); } QQuickTumblerAttachedPrivate::QQuickTumblerAttachedPrivate() |