From 1d6720dc2dbe75f508a29a96db7aea9829a99b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 27 Jul 2009 20:50:01 +0000 Subject: [PATCH] * Don't use B_ZOOM; this does not respect the B_NOT_ZOOMABLE flag, same problem as with B_MINIMIZE. This fixes bug #4134. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31828 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Window.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp index a916a1c3ce..f32fc23eb7 100644 --- a/src/kits/interface/Window.cpp +++ b/src/kits/interface/Window.cpp @@ -62,6 +62,7 @@ // handling of this message into BApplication #define _MINIMIZE_ '_WMZ' +#define _ZOOM_ '_WZO' #define _SWITCH_WORKSPACE_ '_SWS' @@ -855,12 +856,16 @@ BWindow::DispatchMessage(BMessage* msg, BHandler* target) break; case _MINIMIZE_: - { // Used by the minimize shortcut if ((Flags() & B_NOT_MINIMIZABLE) == 0) Minimize(true); break; - } + + case _ZOOM_: + // Used by the zoom shortcut + if ((Flags() & B_NOT_ZOOMABLE) == 0) + Zoom(); + break; case _SWITCH_WORKSPACE_: { @@ -2613,7 +2618,7 @@ BWindow::_InitData(BRect frame, const char* title, window_look look, AddShortcut('M', B_COMMAND_KEY | B_CONTROL_KEY, new BMessage(_MINIMIZE_), NULL); AddShortcut('Z', B_COMMAND_KEY | B_CONTROL_KEY, - new BMessage(B_ZOOM), NULL); + new BMessage(_ZOOM_), NULL); AddShortcut('H', B_COMMAND_KEY | B_CONTROL_KEY, new BMessage(B_HIDE_APPLICATION), NULL);