brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frames: Pass MetaFrameType into ensure_layout

Browse Source 
All the callers already have it, so don't make us fetch it again.
This commit is contained in:
Jasper St. Pierre 2014-12-31 21:40:57 -08:00
parent 4673d8f245
commit 9e199e6350
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ui/frames.c
View File

@ -69,9 +69,6 @@ static void meta_frames_calc_geometry (MetaFrames *frames,
MetaUIFrame *frame, MetaUIFrame *frame,
MetaFrameGeometry *fgeom); MetaFrameGeometry *fgeom);
static void meta_frames_ensure_layout (MetaFrames *frames,
MetaUIFrame *frame);
static MetaUIFrame* meta_frames_lookup_window (MetaFrames *frames, static MetaUIFrame* meta_frames_lookup_window (MetaFrames *frames,
Window xwindow); Window xwindow);
@ -377,23 +374,17 @@ meta_frames_style_updated (GtkWidget *widget)
} }
static void static void
meta_frames_ensure_layout (MetaFrames *frames, meta_frames_ensure_layout (MetaFrames *frames,
MetaUIFrame *frame) MetaUIFrame *frame,
MetaFrameType type)
{ {
GtkWidget *widget; GtkWidget *widget;
MetaFrameFlags flags;
MetaFrameType type;
MetaFrameLayout *layout; MetaFrameLayout *layout;
widget = GTK_WIDGET (frames); widget = GTK_WIDGET (frames);
g_return_if_fail (gtk_widget_get_realized (widget)); g_return_if_fail (gtk_widget_get_realized (widget));
meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow,
META_CORE_GET_FRAME_FLAGS, &flags,
META_CORE_GET_FRAME_TYPE, &type,
META_CORE_GET_END);
layout = meta_theme_get_frame_layout (meta_theme_get_default (), type); layout = meta_theme_get_frame_layout (meta_theme_get_default (), type);
if (layout != frame->cache_layout) if (layout != frame->cache_layout)
@ -473,7 +464,7 @@ meta_frames_calc_geometry (MetaFrames *frames,
META_CORE_GET_FRAME_TYPE, &type, META_CORE_GET_FRAME_TYPE, &type,
META_CORE_GET_END); META_CORE_GET_END);
meta_frames_ensure_layout (frames, frame); meta_frames_ensure_layout (frames, frame, type);
meta_prefs_get_button_layout (&button_layout); meta_prefs_get_button_layout (&button_layout);
@ -638,7 +629,7 @@ meta_ui_frame_get_borders (MetaFrames *frames,
g_return_if_fail (type < META_FRAME_TYPE_LAST); g_return_if_fail (type < META_FRAME_TYPE_LAST);
meta_frames_ensure_layout (frames, frame); meta_frames_ensure_layout (frames, frame, type);
/* We can't get the full geometry, because that depends on /* We can't get the full geometry, because that depends on
* the client window size and probably we're being called * the client window size and probably we're being called
@ -1740,7 +1731,7 @@ meta_frames_paint (MetaFrames *frames,
META_CORE_GET_CLIENT_HEIGHT, &h, META_CORE_GET_CLIENT_HEIGHT, &h,
META_CORE_GET_END); META_CORE_GET_END);
meta_frames_ensure_layout (frames, frame); meta_frames_ensure_layout (frames, frame, type);
meta_prefs_get_button_layout (&button_layout); meta_prefs_get_button_layout (&button_layout);