Merge remote-tracking branch 'origin/master' into wayland

This commit is contained in:
Jasper St. Pierre
2013-08-13 10:44:09 -04:00
39 changed files with 80 additions and 5274 deletions

View File

@@ -6002,7 +6002,18 @@ meta_window_get_outer_rect (const MetaWindow *window,
rect->height -= borders.invisible.top + borders.invisible.bottom;
}
else
*rect = window->rect;
{
*rect = window->rect;
if (window->has_custom_frame_extents)
{
GtkBorder *extents = &window->custom_frame_extents;
rect->x += extents->left;
rect->y += extents->top;
rect->width -= extents->left + extents->right;
rect->height -= extents->top + extents->bottom;
}
}
}
const char*