From: YAMAMOTO Mitsuharu Date: Thu, 9 Aug 2007 09:36:42 +0000 (+0000) Subject: (mac_handle_window_event) [USE_MAC_TOOLBAR]: Add further workaround X-Git-Tag: emacs-pretest-23.0.90~11539 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f94264798798821b09ddf5ace25078ee319a5cd8;p=emacs.git (mac_handle_window_event) [USE_MAC_TOOLBAR]: Add further workaround for window repositioning. --- diff --git a/src/ChangeLog b/src/ChangeLog index e07c4696c9e..d2121578235 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -13,6 +13,8 @@ (XTread_socket): Call ActivateControl/DeactivateControl here. (XTread_socket) [TARGET_API_MAC_CARBON]: Check mac_pass_command_to_system and mac_pass_control_to_system here. + (mac_handle_window_event) [USE_MAC_TOOLBAR]: Add further workaround + for window repositioning. 2007-08-07 Chong Yidong diff --git a/src/macterm.c b/src/macterm.c index d1d9205d5dc..7d6934b806b 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -10719,7 +10719,10 @@ mac_handle_window_event (next_handler, event, data) /* This is a workaround. RepositionWindow fails to put a window at the cascading position when its parent window has a Carbon HIToolbar. */ - if (f->top_pos == sf->top_pos && f->left_pos == sf->left_pos) + if ((f->left_pos == sf->left_pos + && f->top_pos == sf->top_pos) + || (f->left_pos == sf->left_pos + 10 * 2 + && f->top_pos == sf->top_pos + 32 * 2)) MoveWindowStructure (wp, f->left_pos + 10, f->top_pos + 32); #endif }