From 7bcd852276e8d7e941144760c836e9eefffb1107 Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Tue, 21 May 2019 15:09:36 -0400
Subject: theme: Make meta_frame_draw_theme take a GtkStyleContext instead of a
 widget

The style context of the widget is rarely what we want. We won't
fix this to be a MetaFrames style context yet; this just changes
the internal API.

https://bugzilla.gnome.org/show_bug.cgi?id=690317

upstream commit:
https://gitlab.gnome.org/GNOME/metacity/commit/76aa0704
---
 src/ui/frames.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/ui/frames.c')

diff --git a/src/ui/frames.c b/src/ui/frames.c
index c7d0a20d..1aefa4b7 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -2542,17 +2542,19 @@ meta_frames_paint_to_drawable (MetaFrames   *frames,
   meta_prefs_get_button_layout (&button_layout);
 
   scale = gdk_window_get_scale_factor (frame->window);
-  meta_theme_draw_frame_with_style (meta_theme_get_current (),
+  meta_theme_draw_frame (meta_theme_get_current (),
                                     frame->style,
                                     cr,
                                     type,
                                     flags,
-                                    w / scale, h / scale,
+                                    w / scale,
+                                    h / scale,
                                     frame->layout,
                                     frame->text_height,
                                     &button_layout,
                                     button_states,
-                                    mini_icon, icon);
+                                    mini_icon,
+                                    icon);
 }
 
 static gboolean
-- 
cgit v1.2.1