brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only use saved_rect for determining the position to unmaximize to for the

Browse Source 
2007-04-03  Elijah Newren  <newren gmail com>

	* src/window.c (meta_window_unmaximize):
	Only use saved_rect for determining the position to unmaximize to
	for the previously-maximized direction(s).  Fixes #355497.

svn path=/trunk/; revision=3154
This commit is contained in:
Elijah Newren 2007-04-04 03:07:26 +00:00 committed by Elijah Newren
parent b01dcaa338
commit 7a799b3a63
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-04-03 Elijah Newren <newren gmail com>
* src/window.c (meta_window_unmaximize):
Only use saved_rect for determining the position to unmaximize to
for the previously-maximized direction(s). Fixes #355497.
2007-04-03 Elijah Newren <newren gmail com> 2007-04-03 Elijah Newren <newren gmail com>
* MAINTAINERS: Update. #412319. * MAINTAINERS: Update. #412319.

30
src/window.c
View File

@ -2394,6 +2394,8 @@ meta_window_unmaximize (MetaWindow *window,
if ((unmaximize_horizontally && window->maximized_horizontally) || if ((unmaximize_horizontally && window->maximized_horizontally) ||
(unmaximize_vertically && window->maximized_vertically)) (unmaximize_vertically && window->maximized_vertically))
{ {
MetaRectangle target_rect;
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Unmaximizing %s%s\n", "Unmaximizing %s%s\n",
window->desc, window->desc,
@ -2406,6 +2408,22 @@ meta_window_unmaximize (MetaWindow *window,
window->maximized_vertically = window->maximized_vertically =
window->maximized_vertically && !unmaximize_vertically; window->maximized_vertically && !unmaximize_vertically;
/* Unmaximize to the saved_rect position in the direction(s)
* being unmaximized.
*/
target_rect = window->rect;
meta_window_get_position (window, &target_rect.x, &target_rect.y);
if (unmaximize_horizontally)
{
target_rect.x = window->saved_rect.x;
target_rect.width = window->saved_rect.width;
}
if (unmaximize_vertically)
{
target_rect.y = window->saved_rect.y;
target_rect.height = window->saved_rect.height;
}
/* When we unmaximize, if we're doing a mouse move also we could /* When we unmaximize, if we're doing a mouse move also we could
* get the window suddenly jumping to the upper left corner of * get the window suddenly jumping to the upper left corner of
* the workspace, since that's where it was when the grab op * the workspace, since that's where it was when the grab op
@ -2414,19 +2432,19 @@ meta_window_unmaximize (MetaWindow *window,
if (meta_grab_op_is_moving (window->display->grab_op) && if (meta_grab_op_is_moving (window->display->grab_op) &&
window->display->grab_window == window) window->display->grab_window == window)
{ {
window->display->grab_anchor_window_pos = window->saved_rect; window->display->grab_anchor_window_pos = target_rect;
} }
meta_window_move_resize (window, meta_window_move_resize (window,
FALSE, FALSE,
window->saved_rect.x, target_rect.x,
window->saved_rect.y, target_rect.y,
window->saved_rect.width, target_rect.width,
window->saved_rect.height); target_rect.height);
if (window->display->grab_wireframe_active) if (window->display->grab_wireframe_active)
{ {
window->display->grab_wireframe_rect = window->saved_rect; window->display->grab_wireframe_rect = target_rect;
} }
recalc_window_features (window); recalc_window_features (window);