all repos — fluxbox @ 2944cd0014cde6a219822f120fff9588225e8776

custom fork of the fluxbox windowmanager 

make the menu bit of decoration masks control whether or not menu button is shown on window (it did nothing before)
Mark Tiefenbruck mark@fluxbox.org
commit

2944cd0014cde6a219822f120fff9588225e8776

parent

fb52be0c47bb41793fe1ac1eed710fb5375ec3d6

2 files changed, 13 insertions(+), 12 deletions(-)

jump to
M src/Window.cc → src/Window.cc 
@@ -3613,15 +3613,16 @@ winbtn->setOnClick(shade_cmd);
                 }
                 break;
             case WinButton::MENUICON:
-                winbtn = new WinButton(*this, m_button_theme,
-                                       screen().pressedWinButtonTheme(),
-                                       dir[i],
-                                       frame().titlebar(),
-                                       0, 0, 10, 10);
-                winbtn->join(titleSig(),
+                if (m_state.deco_mask & WindowState::DECORM_MENU) {
+                    winbtn = new WinButton(*this, m_button_theme,
+                            screen().pressedWinButtonTheme(),
+                            dir[i],
+                            frame().titlebar(),
+                            0, 0, 10, 10);
+                    winbtn->join(titleSig(),
                              FbTk::MemFunIgnoreArgs(*winbtn, &WinButton::updateAll));
-
-                winbtn->setOnClick(show_menu_cmd);
+                    winbtn->setOnClick(show_menu_cmd);
+                }
                 break;
             }
M src/WindowState.hh → src/WindowState.hh 
@@ -90,10 +90,10 @@ 
     enum Decoration {
         DECOR_NONE = 0,
         DECOR_NORMAL = DECORM_LAST - 1,
-        DECOR_TINY = DECORM_TITLEBAR|DECORM_ICONIFY|DECORM_MENU|DECORM_TAB,
-        DECOR_TOOL = DECORM_TITLEBAR|DECORM_MENU,
-        DECOR_BORDER = DECORM_BORDER|DECORM_MENU,
-        DECOR_TAB = DECORM_BORDER|DECORM_MENU|DECORM_TAB
+        DECOR_TINY = DECORM_TITLEBAR|DECORM_ICONIFY,
+        DECOR_TOOL = DECORM_TITLEBAR,
+        DECOR_BORDER = DECORM_BORDER,
+        DECOR_TAB = DECORM_BORDER|DECORM_TAB
     };
 
     enum WindowType {