(mac_handle_window_event) [USE_MAC_TOOLBAR]: Add further workaround

for window repositioning.

diff --git a/src/ChangeLog b/src/ChangeLog
index e07c4696c9eeac831a216f2f07c953e072dc25b8..d21215782357e4a5363d4db876dc8ad69b5db789 100644 (file)
--- 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  <cyd@stupidchicken.com>
 

diff --git a/src/macterm.c b/src/macterm.c
index d1d9205d5dc8e4091317b95f0024cde934859c72..7d6934b806bde9ba71b0be2084acc44ea856741d 100644 (file)
--- 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
            }