isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

frames: Don't pass the frame rect into get_mask

Browse Source 
We can query it directly.
This commit is contained in:
Jasper St. Pierre 2015-01-01 11:06:47 -08:00
parent d4ea2bbd9c
commit 4d3511649b
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/frame.c
View File

@ -386,7 +386,7 @@ void
meta_frame_get_mask (MetaFrame *frame, meta_frame_get_mask (MetaFrame *frame,
cairo_t *cr) cairo_t *cr)
{ {
meta_ui_frame_get_mask (frame->ui_frame, frame->rect.width, frame->rect.height, cr); meta_ui_frame_get_mask (frame->ui_frame, cr);
} }
void void

9
src/ui/frames.c
View File

@ -1487,30 +1487,27 @@ get_visible_frame_border_region (MetaUIFrame *frame)
* *
* @frame: This frame * @frame: This frame
* @xwindow: The X window for the frame, which has the client window as a child * @xwindow: The X window for the frame, which has the client window as a child
* @width: The width of the framed window including any invisible borders
* @height: The height of the framed window including any invisible borders
* @cr: Used to draw the resulting mask * @cr: Used to draw the resulting mask
*/ */
void void
meta_ui_frame_get_mask (MetaUIFrame *frame, meta_ui_frame_get_mask (MetaUIFrame *frame,
guint width,
guint height,
cairo_t *cr) cairo_t *cr)
{ {
MetaFrameBorders borders; MetaFrameBorders borders;
MetaFrameFlags flags; MetaFrameFlags flags;
MetaRectangle frame_rect;
meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
frame->xwindow, frame->xwindow,
META_CORE_GET_FRAME_FLAGS, &flags, META_CORE_GET_FRAME_FLAGS, &flags,
META_CORE_GET_FRAME_RECT, &frame_rect,
META_CORE_GET_END); META_CORE_GET_END);
meta_style_info_set_flags (frame->style_info, flags); meta_style_info_set_flags (frame->style_info, flags);
meta_ui_frame_get_borders (frame, &borders); meta_ui_frame_get_borders (frame, &borders);
gtk_render_background (frame->style_info->styles[META_STYLE_ELEMENT_FRAME], cr, gtk_render_background (frame->style_info->styles[META_STYLE_ELEMENT_FRAME], cr,
borders.invisible.left, borders.invisible.top, borders.invisible.left, borders.invisible.top,
width - borders.invisible.left - borders.invisible.right, frame_rect.width, frame_rect.height);
height - borders.invisible.top - borders.invisible.bottom);
} }
/* XXX -- this is disgusting. Find a better approach here. /* XXX -- this is disgusting. Find a better approach here.

2
src/ui/frames.h
View File

@ -140,8 +140,6 @@ cairo_region_t * meta_ui_frame_get_bounds (MetaUIFrame *frame,
int window_height); int window_height);
void meta_ui_frame_get_mask (MetaUIFrame *frame, void meta_ui_frame_get_mask (MetaUIFrame *frame,
guint width,
guint height,
cairo_t *cr); cairo_t *cr);
void meta_ui_frame_move_resize (MetaUIFrame *frame, void meta_ui_frame_move_resize (MetaUIFrame *frame,