aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2012-07-14 08:08:28 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2012-07-14 08:08:28 (GMT)
commita076bdcbdaef5d61370acd35e8e2870fb7ad9e09 (patch)
tree407162dc75cc242fa446a7dece77987aad0c81e8 /src/Window.cc
parent9a28a8bfec7606f19f373a27df33a89ba6f7de7c (diff)
parent2944cd0014cde6a219822f120fff9588225e8776 (diff)
downloadfluxbox-a076bdcbdaef5d61370acd35e8e2870fb7ad9e09.zip
fluxbox-a076bdcbdaef5d61370acd35e8e2870fb7ad9e09.tar.bz2
merge
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/Window.cc b/src/Window.cc
index f5a2fe2..747c909 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3306,6 +3306,10 @@ bool FluxboxWindow::acceptsFocus() const {
3306 return (m_client ? m_client->acceptsFocus() : false); 3306 return (m_client ? m_client->acceptsFocus() : false);
3307} 3307}
3308 3308
3309bool FluxboxWindow::isModal() const {
3310 return (m_client ? m_client->isModal() : true);
3311}
3312
3309const FbTk::PixmapWithMask &FluxboxWindow::icon() const { 3313const FbTk::PixmapWithMask &FluxboxWindow::icon() const {
3310 return (m_client ? m_client->icon() : m_icon); 3314 return (m_client ? m_client->icon() : m_icon);
3311} 3315}
@@ -3609,15 +3613,16 @@ void FluxboxWindow::updateButtons() {
3609 } 3613 }
3610 break; 3614 break;
3611 case WinButton::MENUICON: 3615 case WinButton::MENUICON:
3612 winbtn = new WinButton(*this, m_button_theme, 3616 if (m_state.deco_mask & WindowState::DECORM_MENU) {
3613 screen().pressedWinButtonTheme(), 3617 winbtn = new WinButton(*this, m_button_theme,
3614 dir[i], 3618 screen().pressedWinButtonTheme(),
3615 frame().titlebar(), 3619 dir[i],
3616 0, 0, 10, 10); 3620 frame().titlebar(),
3617 winbtn->join(titleSig(), 3621 0, 0, 10, 10);
3622 winbtn->join(titleSig(),
3618 FbTk::MemFunIgnoreArgs(*winbtn, &WinButton::updateAll)); 3623 FbTk::MemFunIgnoreArgs(*winbtn, &WinButton::updateAll));
3619 3624 winbtn->setOnClick(show_menu_cmd);
3620 winbtn->setOnClick(show_menu_cmd); 3625 }
3621 break; 3626 break;
3622 } 3627 }
3623 3628