diff options
author | Vladimir A. Pavlov <pv4@bk.ru> | 2012-12-07 20:10:23 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2012-12-30 11:27:47 (GMT) |
commit | c8d0945a8ff595cd3b5015b6a253bb0a9355633c (patch) | |
tree | 35a5b5e8a0d1a94f04a528bbbe8b7907e18ebf24 | |
parent | 36489e4a17df27965ff14b7fd0a9482b4cf47882 (diff) | |
download | fluxbox_pavel-c8d0945a8ff595cd3b5015b6a253bb0a9355633c.zip fluxbox_pavel-c8d0945a8ff595cd3b5015b6a253bb0a9355633c.tar.bz2 |
Make use of window.stuck.pressed.pixmap
-rw-r--r-- | src/WinButton.cc | 4 | ||||
-rw-r--r-- | src/WinButtonTheme.hh | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/WinButton.cc b/src/WinButton.cc index 703820d..ff0ff76 100644 --- a/src/WinButton.cc +++ b/src/WinButton.cc | |||
@@ -151,6 +151,8 @@ Pixmap WinButton::getPressedPixmap() const { | |||
151 | case MINIMIZE: | 151 | case MINIMIZE: |
152 | return m_pressed_theme->iconifyPixmap().pixmap().drawable(); | 152 | return m_pressed_theme->iconifyPixmap().pixmap().drawable(); |
153 | case STICK: | 153 | case STICK: |
154 | if (m_listen_to.isStuck()) | ||
155 | return m_pressed_theme->stuckPixmap().pixmap().drawable(); | ||
154 | return m_pressed_theme->stickPixmap().pixmap().drawable(); | 156 | return m_pressed_theme->stickPixmap().pixmap().drawable(); |
155 | case CLOSE: | 157 | case CLOSE: |
156 | return m_pressed_theme->closePixmap().pixmap().drawable(); | 158 | return m_pressed_theme->closePixmap().pixmap().drawable(); |
@@ -308,7 +310,7 @@ void WinButton::updateAll() { | |||
308 | setBackgroundPixmap(my_pm); | 310 | setBackgroundPixmap(my_pm); |
309 | 311 | ||
310 | // incorrect, pressed_pixmap is stateful in shade, so we'll do oneoff for now | 312 | // incorrect, pressed_pixmap is stateful in shade, so we'll do oneoff for now |
311 | if (m_type == SHADE) { | 313 | if (m_type == SHADE || m_type == STICK) { |
312 | Pixmap p_pm = getPressedPixmap(); | 314 | Pixmap p_pm = getPressedPixmap(); |
313 | if (p_pm != None) | 315 | if (p_pm != None) |
314 | setPressedPixmap(p_pm); | 316 | setPressedPixmap(p_pm); |
diff --git a/src/WinButtonTheme.hh b/src/WinButtonTheme.hh index 4765822..224fc6c 100644 --- a/src/WinButtonTheme.hh +++ b/src/WinButtonTheme.hh | |||
@@ -51,6 +51,7 @@ public: | |||
51 | const FbTk::PixmapWithMask &stickPixmap() const { return *m_stick_pm; } | 51 | const FbTk::PixmapWithMask &stickPixmap() const { return *m_stick_pm; } |
52 | FbTk::PixmapWithMask &stickPixmap() { return *m_stick_pm; } | 52 | FbTk::PixmapWithMask &stickPixmap() { return *m_stick_pm; } |
53 | 53 | ||
54 | const FbTk::PixmapWithMask &stuckPixmap() const { return *m_stuck_pm; } | ||
54 | FbTk::PixmapWithMask &stuckPixmap() { return *m_stuck_pm; } | 55 | FbTk::PixmapWithMask &stuckPixmap() { return *m_stuck_pm; } |
55 | 56 | ||
56 | const FbTk::PixmapWithMask &shadePixmap() const { return *m_shade_pm; } | 57 | const FbTk::PixmapWithMask &shadePixmap() const { return *m_shade_pm; } |