nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make the menu bit of decoration masks control whether or not menu button is shown on window (it did nothing before)

Browse source
This commit is contained in:
Mark Tiefenbruck 2012-07-08 17:56:26 -07:00
parent fb52be0c47
commit 2944cd0014
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Window.cc
View file

@ -3613,15 +3613,16 @@ void FluxboxWindow::updateButtons() {
} }
break; break;
case WinButton::MENUICON: case WinButton::MENUICON:
winbtn = new WinButton(*this, m_button_theme, if (m_state.deco_mask & WindowState::DECORM_MENU) {
screen().pressedWinButtonTheme(), winbtn = new WinButton(*this, m_button_theme,
dir[i], screen().pressedWinButtonTheme(),
frame().titlebar(), dir[i],
0, 0, 10, 10); frame().titlebar(),
winbtn->join(titleSig(), 0, 0, 10, 10);
winbtn->join(titleSig(),
FbTk::MemFunIgnoreArgs(*winbtn, &WinButton::updateAll)); FbTk::MemFunIgnoreArgs(*winbtn, &WinButton::updateAll));
winbtn->setOnClick(show_menu_cmd);
winbtn->setOnClick(show_menu_cmd); }
break; break;
} }

8
src/WindowState.hh
View file

@ -90,10 +90,10 @@ public:
enum Decoration { enum Decoration {
DECOR_NONE = 0, DECOR_NONE = 0,
DECOR_NORMAL = DECORM_LAST - 1, DECOR_NORMAL = DECORM_LAST - 1,
DECOR_TINY = DECORM_TITLEBAR|DECORM_ICONIFY|DECORM_MENU|DECORM_TAB, DECOR_TINY = DECORM_TITLEBAR|DECORM_ICONIFY,
DECOR_TOOL = DECORM_TITLEBAR|DECORM_MENU, DECOR_TOOL = DECORM_TITLEBAR,
DECOR_BORDER = DECORM_BORDER|DECORM_MENU, DECOR_BORDER = DECORM_BORDER,
DECOR_TAB = DECORM_BORDER|DECORM_MENU|DECORM_TAB DECOR_TAB = DECORM_BORDER|DECORM_TAB
}; };
enum WindowType { enum WindowType {