Skip to content

Commit 4efc6a4

Browse files
vkarehraveit65
authored andcommitted
Support background fallback on HiDPI
This change is a super hacky way of supporting the fallback desktop background (without caja) on HiDPI displays. It does this by doing two things: using a new function that scales up the background surface; and by loading settings using an updated function that triggers a redraw.
1 parent e7bf4dc commit 4efc6a4

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

‎plugins/background/msd-background-manager.c‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,12 @@ real_draw_bg (MsdBackgroundManager *manager,
185185
{
186186
MsdBackgroundManagerPrivate *p = manager->priv;
187187
GdkWindow *window = gdk_screen_get_root_window (screen);
188-
gint width = WidthOfScreen (gdk_x11_screen_get_xscreen (screen));
189-
gint height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen));
188+
gint scale = gdk_window_get_scale_factor (window);
189+
gint width = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
190+
gint height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
190191

191192
free_bg_surface (manager);
192-
p->surface = mate_bg_create_surface (p->bg, window, width, height, TRUE);
193+
p->surface = mate_bg_create_surface_scale (p->bg, window, width, height, scale, TRUE);
193194

194195
if (p->do_fade)
195196
{
@@ -255,10 +256,12 @@ on_screen_size_changed (GdkScreen *screen,
255256
if (!p->msd_can_draw || p->draw_in_progress || caja_is_drawing_bg (manager))
256257
return;
257258

259+
GdkWindow *window = gdk_screen_get_root_window (screen);
260+
gint scale = gdk_window_get_scale_factor (window);
258261
gint scr_num = gdk_x11_screen_get_screen_number (screen);
259262
gchar *old_size = g_list_nth_data (manager->priv->scr_sizes, scr_num);
260-
gchar *new_size = g_strdup_printf ("%dx%d", WidthOfScreen (gdk_x11_screen_get_xscreen (screen)),
261-
HeightOfScreen (gdk_x11_screen_get_xscreen (screen)));
263+
gchar *new_size = g_strdup_printf ("%dx%d", WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale,
264+
HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale);
262265
if (g_strcmp0 (old_size, new_size) != 0)
263266
{
264267
g_debug ("Screen%d size changed: %s -> %s", scr_num, old_size, new_size);
@@ -297,8 +300,7 @@ settings_change_event_idle_cb (MsdBackgroundManager *manager)
297300
{
298301
mate_settings_profile_start ("settings_change_event_idle_cb");
299302

300-
mate_bg_load_from_gsettings (manager->priv->bg,
301-
manager->priv->settings);
303+
mate_bg_load_from_preferences (manager->priv->bg);
302304

303305
mate_settings_profile_end ("settings_change_event_idle_cb");
304306

0 commit comments

Comments
 (0)