isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

core: Convert GET_FRAME_WIDTH / GET_FRAME_HEIGHT to GET_FRAME_RECT

Browse Source 
Since we're going to be calling meta_window_get_frame_rect in here
soon, I'd rather it be one method call, rather than two. We can't
put it at the toplevel, since that might cause infinite recursion
(e.g. meta_core_get calls meta_window_get_frame_rect calls
meta_ui_get_frame_borders calls meta_core_get, ...)
This commit is contained in:
Jasper St. Pierre 2014-05-25 08:16:47 -04:00
parent 4acb902423
commit 19d26dde92
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/core.c
View File

@ -120,11 +120,8 @@ meta_core_get (Display *xdisplay,
case META_CORE_GET_ICON: case META_CORE_GET_ICON:
*((GdkPixbuf**)answer) = window->icon; *((GdkPixbuf**)answer) = window->icon;
break; break;
case META_CORE_GET_FRAME_WIDTH: case META_CORE_GET_FRAME_RECT:
*((gint*)answer) = window->frame->rect.width; *((MetaRectangle*)answer) = window->frame->rect;
break;
case META_CORE_GET_FRAME_HEIGHT:
*((gint*)answer) = window->frame->rect.height;
break; break;
case META_CORE_GET_THEME_VARIANT: case META_CORE_GET_THEME_VARIANT:
*((char**)answer) = window->gtk_theme_variant; *((char**)answer) = window->gtk_theme_variant;

3
src/core/core.h
View File

@ -37,8 +37,7 @@ typedef enum
META_CORE_GET_FRAME_TYPE, META_CORE_GET_FRAME_TYPE,
META_CORE_GET_MINI_ICON, META_CORE_GET_MINI_ICON,
META_CORE_GET_ICON, META_CORE_GET_ICON,
META_CORE_GET_FRAME_WIDTH, META_CORE_GET_FRAME_RECT,
META_CORE_GET_FRAME_HEIGHT,
META_CORE_GET_THEME_VARIANT, META_CORE_GET_THEME_VARIANT,
} MetaCoreGetType; } MetaCoreGetType;

9
src/ui/frames.c
View File

@ -1601,21 +1601,20 @@ static void
clip_region_to_visible_frame_border (cairo_region_t *region, clip_region_to_visible_frame_border (cairo_region_t *region,
MetaUIFrame *frame) MetaUIFrame *frame)
{ {
MetaRectangle frame_rect;
cairo_rectangle_int_t area; cairo_rectangle_int_t area;
cairo_region_t *frame_border; cairo_region_t *frame_border;
MetaFrameFlags flags; MetaFrameFlags flags;
MetaFrameType type; MetaFrameType type;
MetaFrameBorders borders; MetaFrameBorders borders;
Display *display; Display *display;
int frame_width, frame_height;
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
meta_core_get (display, frame->xwindow, meta_core_get (display, frame->xwindow,
META_CORE_GET_FRAME_FLAGS, &flags, META_CORE_GET_FRAME_FLAGS, &flags,
META_CORE_GET_FRAME_TYPE, &type, META_CORE_GET_FRAME_TYPE, &type,
META_CORE_GET_FRAME_WIDTH, &frame_width, META_CORE_GET_FRAME_RECT, &frame_rect,
META_CORE_GET_FRAME_HEIGHT, &frame_height,
META_CORE_GET_END); META_CORE_GET_END);
meta_theme_get_frame_borders (meta_theme_get_current (), meta_theme_get_frame_borders (meta_theme_get_current (),
@ -1625,8 +1624,8 @@ clip_region_to_visible_frame_border (cairo_region_t *region,
/* Visible frame rect */ /* Visible frame rect */
area.x = borders.invisible.left; area.x = borders.invisible.left;
area.y = borders.invisible.top; area.y = borders.invisible.top;
area.width = frame_width - borders.invisible.left - borders.invisible.right; area.width = frame_rect.width - borders.invisible.left - borders.invisible.right;
area.height = frame_height - borders.invisible.top - borders.invisible.bottom; area.height = frame_rect.height - borders.invisible.top - borders.invisible.bottom;
frame_border = cairo_region_create_rectangle (&area); frame_border = cairo_region_create_rectangle (&area);