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

window: Set custom frame extents to 0 if we don't have any

Browse Source 
This is just a quick code cleanup.
This commit is contained in:
Jasper St. Pierre 2014-06-26 11:13:09 -04:00
parent c562657f1e
commit a615f93060
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/window.c
View File

@ -4092,16 +4092,13 @@ meta_window_client_rect_to_frame_rect (MetaWindow *window,
} }
else else
{ {
if (window->has_custom_frame_extents) const GtkBorder *extents = &window->custom_frame_extents;
{ frame_rect->x += extents->left;
const GtkBorder *extents = &window->custom_frame_extents; frame_rect->y += extents->top;
frame_rect->x += extents->left; if (frame_rect->width != G_MAXINT)
frame_rect->y += extents->top; frame_rect->width -= extents->left + extents->right;
if (frame_rect->width != G_MAXINT) if (frame_rect->height != G_MAXINT)
frame_rect->width -= extents->left + extents->right; frame_rect->height -= extents->top + extents->bottom;
if (frame_rect->height != G_MAXINT)
frame_rect->height -= extents->top + extents->bottom;
}
} }
} }
@ -4136,14 +4133,11 @@ meta_window_frame_rect_to_client_rect (MetaWindow *window,
} }
else else
{ {
if (window->has_custom_frame_extents) const GtkBorder *extents = &window->custom_frame_extents;
{ client_rect->x -= extents->left;
const GtkBorder *extents = &window->custom_frame_extents; client_rect->y -= extents->top;
client_rect->x -= extents->left; client_rect->width += extents->left + extents->right;
client_rect->y -= extents->top; client_rect->height += extents->top + extents->bottom;
client_rect->width += extents->left + extents->right;
client_rect->height += extents->top + extents->bottom;
}
} }
} }
@ -7958,6 +7952,7 @@ meta_window_set_custom_frame_extents (MetaWindow *window,
else else
{ {
window->has_custom_frame_extents = FALSE; window->has_custom_frame_extents = FALSE;
memset (&window->custom_frame_extents, 0, sizeof (window->custom_frame_extents));
} }
meta_window_queue (window, META_QUEUE_MOVE_RESIZE); meta_window_queue (window, META_QUEUE_MOVE_RESIZE);