summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-09-03 16:15:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-03 17:01:38 +0100
commitfeddd3d87077abb2d5435804a9a4859286f6d86f (patch)
treefe5d61ee70ac4f940c33b61bdfca67bbf7b9a000 /vcl/unx/gtk
parent402603793360fb058f84e2aa88d5fdcd6131334d (diff)
Refetch fonts if new ones installed or old ones deinstalled
i.e. honour gtk-fontconfig-timestamp so that if we request a font from packagekit to be installed, then we can auto-use it when it appears. Change-Id: Id0d914a3f9cd589d9e8a87bf9be4b6e47de2e191
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 011e755a51a9..da3cc507ddc7 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3699,6 +3699,17 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
GtkSettings* pSettings = gtk_widget_get_settings( m_pWindow );
StyleSettings aStyleSet = rSettings.GetStyleSettings();
+ guint latest_fontconfig_timestamp = 0;
+ static guint our_fontconfig_timestamp = 0;
+ g_object_get( pSettings, "gtk-fontconfig-timestamp", &latest_fontconfig_timestamp, (char *)NULL );
+ if (latest_fontconfig_timestamp != our_fontconfig_timestamp)
+ {
+ bool bFirstTime = our_fontconfig_timestamp == 0;
+ our_fontconfig_timestamp = latest_fontconfig_timestamp;
+ if (!bFirstTime)
+ psp::PrintFontManager::get().initialize();
+ }
+
// get the widgets in place
NWEnsureGTKMenu( m_nXScreen );
NWEnsureGTKMenubar( m_nXScreen );