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

constraints: account for decorations when positioning modal dialogs

Browse Source 
What we want to achieve is that the dialog is visually centered
on the parent, including the decorations for both, and making sure
that CSD/frame_extents are respected.

https://bugzilla.gnome.org/show_bug.cgi?id=707194
This commit is contained in:
Giovanni Campagna 2013-09-02 11:22:11 +02:00 committed by Owen W. Taylor
parent aad275b9a2
commit a1087c3f30
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/constraints.c
View File

@ -765,18 +765,28 @@ constrain_modal_dialog (MetaWindow *window,
{ {
int x, y; int x, y;
MetaWindow *parent = meta_window_get_transient_for (window); MetaWindow *parent = meta_window_get_transient_for (window);
MetaRectangle child_rect, parent_rect;
gboolean constraint_already_satisfied; gboolean constraint_already_satisfied;
if (!meta_window_is_attached_dialog (window)) if (!meta_window_is_attached_dialog (window))
return TRUE; return TRUE;
x = parent->rect.x + (parent->rect.width / 2 - info->current.width / 2); /* We want to center the dialog on the parent, including the decorations
y = parent->rect.y + (parent->rect.height / 2 - info->current.height / 2); for both of them. info->current is in client X window coordinates, so we need
if (parent->frame) to convert them to frame coordinates, apply the centering and then
{ convert back to client.
x += parent->frame->rect.x; */
y += parent->frame->rect.y;
} child_rect = info->current;
extend_by_frame (&child_rect, info->borders);
meta_window_get_outer_rect (parent, &parent_rect);
child_rect.x = parent_rect.x + (parent_rect.width / 2 - child_rect.width / 2);
child_rect.y = parent_rect.y + (parent_rect.height / 2 - child_rect.height / 2);
unextend_by_frame (&child_rect, info->borders);
x = child_rect.x;
y = child_rect.y;
constraint_already_satisfied = (x == info->current.x) && (y == info->current.y); constraint_already_satisfied = (x == info->current.x) && (y == info->current.y);