From 88352b72743a997122a83472f510e6dac14974ef Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Sun, 23 Nov 2014 22:54:30 +0100 Subject: [PATCH] wmaker: do not remove Title Bar for windows that declare themselves as Toolbar or Tear-off menu MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As pointed by Germán Arias, some windows in GNUstep did not have a title bar because they declare themselves with the NET_WM type MENU. A closer look at the spec shows that this type is meant for stuff like tear off menus, and thus like for toolbar it is not expected that the application does not want a titlebar, as opposite to DROPDOWN_MENU, POPUP_MENU and COMBO. So, this patch moves the case for TYPE_MENU to be the same as TYPE_TOOLBAR and remove the flag that disables having a title bar. Signed-off-by: Christophe CURIS --- src/wmspec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/wmspec.c b/src/wmspec.c index 6b33c327..d2a9555a 100644 --- a/src/wmspec.c +++ b/src/wmspec.c @@ -1175,8 +1175,8 @@ static Bool handleWindowType(WWindow *wwin, Atom type, int *layer) wwin->client_flags.skip_switchpanel = 1; wwin->client_flags.dont_move_off = 1; wwin->flags.net_skip_pager = 1; - } else if (type == net_wm_window_type_toolbar) { - wwin->client_flags.no_titlebar = 1; + } else if (type == net_wm_window_type_toolbar || + type == net_wm_window_type_menu) { wwin->client_flags.no_resizable = 1; wwin->client_flags.no_miniaturizable = 1; wwin->client_flags.no_resizebar = 1; @@ -1185,8 +1185,7 @@ static Bool handleWindowType(WWindow *wwin, Atom type, int *layer) wwin->client_flags.skip_switchpanel = 1; wwin->client_flags.dont_move_off = 1; wwin->client_flags.no_appicon = 1; - } else if (type == net_wm_window_type_menu || - type == net_wm_window_type_dropdown_menu || + } else if (type == net_wm_window_type_dropdown_menu || type == net_wm_window_type_popup_menu || type == net_wm_window_type_combo) { wwin->client_flags.no_titlebar = 1; -- 2.11.4.GIT