summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/vcl/settings.hxx3
-rw-r--r--vcl/android/androidinst.cxx1
-rw-r--r--vcl/ios/iosinst.cxx1
-rw-r--r--vcl/osx/salframe.cxx1
-rw-r--r--vcl/source/app/settings.cxx17
-rw-r--r--vcl/source/control/tabctrl.cxx2
-rw-r--r--vcl/source/window/settings.cxx6
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx1
-rw-r--r--vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx1
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx1
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx1
-rw-r--r--vcl/win/source/window/salframe.cxx1
12 files changed, 35 insertions, 1 deletions
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 1775e095874a..9f5a0cb4237a 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -426,6 +426,9 @@ public:
void SetIconFont( const vcl::Font& rFont );
const vcl::Font& GetIconFont() const;
+ void SetTabFont( const vcl::Font& rFont );
+ const vcl::Font& GetTabFont() const;
+
long GetBorderSize() const;
void SetTitleHeight( long nSize );
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 5b766d5686e7..6099536950ee 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -278,6 +278,7 @@ public:
aStyleSet.SetPushButtonFont( aFont );
aStyleSet.SetFieldFont( aFont );
aStyleSet.SetIconFont( aFont );
+ aStyleSet.SetTabFont( aFont );
aStyleSet.SetGroupFont( aFont );
rSettings.SetStyleSettings( aStyleSet );
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 8356e8e8feba..f2dabd53bf29 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -159,6 +159,7 @@ public:
aStyleSet.SetPushButtonFont( aFont );
aStyleSet.SetFieldFont( aFont );
aStyleSet.SetIconFont( aFont );
+ aStyleSet.SetTabFont( aFont );
aStyleSet.SetGroupFont( aFont );
rSettings.SetStyleSettings( aStyleSet );
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index beb188df8de0..b23b3e64ff75 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1176,6 +1176,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetRadioCheckFont( aLabelFont );
aStyleSettings.SetFieldFont( aLabelFont );
aStyleSettings.SetGroupFont( aLabelFont );
+ aStyleSettings.SetTabFont( aLabelFont );
aStyleSettings.SetIconFont( aLabelFont );
Color aHighlightColor( getColor( [NSColor selectedTextBackgroundColor],
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 70511c58880a..4f81689c939e 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -146,6 +146,7 @@ struct ImplStyleData
vcl::Font maPushButtonFont;
vcl::Font maFieldFont;
vcl::Font maIconFont;
+ vcl::Font maTabFont;
vcl::Font maGroupFont;
long mnBorderSize;
long mnTitleHeight;
@@ -617,6 +618,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maPushButtonFont( rData.maPushButtonFont ),
maFieldFont( rData.maFieldFont ),
maIconFont( rData.maIconFont ),
+ maTabFont( rData.maTabFont ),
maGroupFont( rData.maGroupFont ),
mIconTheme(rData.mIconTheme),
maDialogStyle( rData.maDialogStyle ),
@@ -687,6 +689,7 @@ void ImplStyleData::SetStandardStyles()
maPushButtonFont = aStdFont;
maFieldFont = aStdFont;
maIconFont = aStdFont;
+ maTabFont = aStdFont;
aStdFont.SetWeight( WEIGHT_BOLD );
maFloatTitleFont = aStdFont;
maTitleFont = aStdFont;
@@ -1661,6 +1664,19 @@ StyleSettings::GetIconFont() const
return mxData->maIconFont;
}
+void
+StyleSettings::SetTabFont( const vcl::Font& rFont )
+{
+ CopyData();
+ mxData->maTabFont = rFont;
+}
+
+const vcl::Font&
+StyleSettings::GetTabFont() const
+{
+ return mxData->maTabFont;
+}
+
long
StyleSettings::GetBorderSize() const
{
@@ -2312,6 +2328,7 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
(mxData->maPushButtonFont == rSet.mxData->maPushButtonFont) &&
(mxData->maFieldFont == rSet.mxData->maFieldFont) &&
(mxData->maIconFont == rSet.mxData->maIconFont) &&
+ (mxData->maTabFont == rSet.mxData->maTabFont) &&
(mxData->meUseImagesInMenus == rSet.mxData->meUseImagesInMenus) &&
(mxData->mbPreferredUseImagesInMenus == rSet.mxData->mbPreferredUseImagesInMenus) &&
(mxData->mbSkipDisabledInMenus == rSet.mxData->mbSkipDisabledInMenus) &&
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 3d544133c398..ca63e5485d68 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -129,7 +129,7 @@ void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle )
const vcl::Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const
{
- return _rStyle.GetAppFont();
+ return _rStyle.GetTabFont();
}
const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 77ddce2d58a7..3e60bbd9bab0 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -226,6 +226,9 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
aFont = aStyleSettings.GetIconFont();
aFont.SetHeight( defFontheight );
aStyleSettings.SetIconFont( aFont );
+ aFont = aStyleSettings.GetTabFont();
+ aFont.SetHeight( defFontheight );
+ aStyleSettings.SetTabFont( aFont );
aFont = aStyleSettings.GetGroupFont();
aFont.SetHeight( defFontheight );
aStyleSettings.SetGroupFont( aFont );
@@ -294,6 +297,9 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
aFont = aStyleSettings.GetIconFont();
aFont.SetWeight( WEIGHT_BOLD );
aStyleSettings.SetIconFont( aFont );
+ aFont = aStyleSettings.GetTabFont();
+ aFont.SetWeight( WEIGHT_BOLD );
+ aStyleSettings.SetTabFont( aFont );
rSettings.SetStyleSettings( aStyleSettings );
}
#endif
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 878540f3c92c..64cc7def944d 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -4136,6 +4136,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
aStyleSet.SetPushButtonFont( aFont );
aStyleSet.SetFieldFont( aFont );
aStyleSet.SetIconFont( aFont );
+ aStyleSet.SetTabFont( aFont );
aStyleSet.SetGroupFont( aFont );
aFont.SetWeight( WEIGHT_BOLD );
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 9bf98246de9a..8a141a410df1 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1387,6 +1387,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
aStyleSet.SetGroupFont( aFont );
aFont.SetWeight( WEIGHT_BOLD );
+ aStyleSet.SetTabFont( aFont ); //pull from notebook style + GTK_STYLE_REGION_TAB ?
aStyleSet.SetTitleFont( aFont );
aStyleSet.SetFloatTitleFont( aFont );
// get cursor blink time
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index aa873b8eb892..69c00ba191f1 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1944,6 +1944,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetPushButtonFont( aFont );
aStyleSettings.SetFieldFont( aFont );
aStyleSettings.SetIconFont( aFont );
+ aStyleSettings.SetTabFont( aFont );
aStyleSettings.SetGroupFont( aFont );
aFont.SetWeight( WEIGHT_BOLD );
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 173ba12ce069..c358f4d2ce32 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -267,6 +267,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style.SetPushButtonFont( aFont );
style.SetFieldFont( aFont );
style.SetIconFont( aFont );
+ style.SetTabFont( aFont );
style.SetGroupFont( aFont );
aFont.SetWeight( WEIGHT_BOLD );
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index e9da7341573d..12b8f3eb1e52 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2812,6 +2812,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
aAppFont.SetWeight( WEIGHT_NORMAL );
aStyleSettings.SetInfoFont( aAppFont );
aStyleSettings.SetToolFont( aAppFont );
+ aStyleSettings.SetTabFont( aAppFont );
BOOL bDragFull;
if ( SystemParametersInfo( SPI_GETDRAGFULLWINDOWS, 0, &bDragFull, 0 ) )
generated by cgit (git 2.34.1) at 2024-06-05 14:46:15 +0000