Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide scale factor to wxGtkStyleContext where it might matter.

Browse Source
This commit is contained in:
Paul Cornett
2018-11-01 09:58:27 -07:00
parent e13a2cfd03
commit dc0cf732a2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gtk/settings.cpp
View File

@@ -790,7 +790,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
g_signal_connect(gtk_settings_get_default(), "notify::gtk-font-name", g_signal_connect(gtk_settings_get_default(), "notify::gtk-font-name",
G_CALLBACK(notify_gtk_font_name), NULL); G_CALLBACK(notify_gtk_font_name), NULL);
} }
wxGtkStyleContext sc; ContainerWidget();
wxGtkStyleContext sc(gtk_widget_get_scale_factor(gs_tlw_parent));
sc.AddButton().AddLabel(); sc.AddButton().AddLabel();
gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL,
GTK_STYLE_PROPERTY_FONT, &info.description, NULL); GTK_STYLE_PROPERTY_FONT, &info.description, NULL);
@@ -874,7 +875,7 @@ static int GetScrollbarWidth()
if (wx_is_at_least_gtk3(20)) if (wx_is_at_least_gtk3(20))
{ {
GtkBorder border; GtkBorder border;
wxGtkStyleContext sc; wxGtkStyleContext sc(gtk_widget_get_scale_factor(ScrollBarWidget()));
sc.Add(GTK_TYPE_SCROLLBAR, "scrollbar", "scrollbar", "vertical", "right", NULL); sc.Add(GTK_TYPE_SCROLLBAR, "scrollbar", "scrollbar", "vertical", "right", NULL);
gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border); gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border);