diff options
Diffstat (limited to 'src/imports/controls')
4 files changed, 15 insertions, 15 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp index ee98c35c..f64205bb 100644 --- a/src/imports/controls/material/qquickmaterialtheme.cpp +++ b/src/imports/controls/material/qquickmaterialtheme.cpp @@ -44,7 +44,7 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme) : QQuickProxyTheme(theme) { systemFont = QFont(QLatin1Literal("Roboto")); - dockWidgetTitleFont = QFont(QLatin1Literal("Roboto"), 10); + tabButtonFont = QFont(QLatin1Literal("Roboto"), 10); } QQuickMaterialTheme::~QQuickMaterialTheme() @@ -54,8 +54,8 @@ QQuickMaterialTheme::~QQuickMaterialTheme() const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const { switch (type) { - case QPlatformTheme::DockWidgetTitleFont: - return &dockWidgetTitleFont; + case QPlatformTheme::TabButtonFont: + return &tabButtonFont; default: return &systemFont; } diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index e3d6ce9b..28fb30e9 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -65,7 +65,7 @@ public: private: QFont systemFont; - QFont dockWidgetTitleFont; // QQuickTabButton + QFont tabButtonFont; }; QT_END_NAMESPACE diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp index fd470ba6..ada6da32 100644 --- a/src/imports/controls/universal/qquickuniversaltheme.cpp +++ b/src/imports/controls/universal/qquickuniversaltheme.cpp @@ -45,11 +45,11 @@ QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme) { systemFont = QFont(QLatin1Literal("Sege UI")); systemFont.setPixelSize(15); - mdiSubWindowTitleFont = systemFont; - mdiSubWindowTitleFont.setWeight(QFont::DemiBold); - dockWidgetTitleFont = QFont(QLatin1Literal("Sege UI")); - dockWidgetTitleFont.setPixelSize(24); - dockWidgetTitleFont.setWeight(QFont::Light); + groupBoxTitleFont = systemFont; + groupBoxTitleFont.setWeight(QFont::DemiBold); + tabButtonFont = QFont(QLatin1Literal("Sege UI")); + tabButtonFont.setPixelSize(24); + tabButtonFont.setWeight(QFont::Light); } QQuickUniversalTheme::~QQuickUniversalTheme() @@ -59,10 +59,10 @@ QQuickUniversalTheme::~QQuickUniversalTheme() const QFont *QQuickUniversalTheme::font(QPlatformTheme::Font type) const { switch (type) { - case QPlatformTheme::MdiSubWindowTitleFont: - return &mdiSubWindowTitleFont; - case QPlatformTheme::DockWidgetTitleFont: - return &dockWidgetTitleFont; + case QPlatformTheme::GroupBoxTitleFont: + return &groupBoxTitleFont; + case QPlatformTheme::TabButtonFont: + return &tabButtonFont; default: return &systemFont; } diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h index c014ead2..20243917 100644 --- a/src/imports/controls/universal/qquickuniversaltheme_p.h +++ b/src/imports/controls/universal/qquickuniversaltheme_p.h @@ -65,8 +65,8 @@ public: private: QFont systemFont; - QFont mdiSubWindowTitleFont; // QQuickGroupBox - QFont dockWidgetTitleFont; // QQuickTabButton + QFont groupBoxTitleFont; + QFont tabButtonFont; }; QT_END_NAMESPACE |