aboutsummaryrefslogtreecommitdiff
path: root/src/WinButton.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/WinButton.cc
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/WinButton.cc')
-rw-r--r--src/WinButton.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/WinButton.cc b/src/WinButton.cc
index f690f93..cdfb8b5 100644
--- a/src/WinButton.cc
+++ b/src/WinButton.cc
@@ -321,15 +321,15 @@ void WinButton::update(FbTk::Subject *subj) {
321 321
322 Display* display = m_listen_to.fbWindow().display(); 322 Display* display = m_listen_to.fbWindow().display();
323 int screen = m_listen_to.screen().screenNumber(); 323 int screen = m_listen_to.screen().screenNumber();
324 if (m_listen_to.usePixmap()) { 324 if (m_listen_to.icon().pixmap().drawable() != None) {
325 m_icon_pixmap.copy(m_listen_to.iconPixmap().drawable(), 325 m_icon_pixmap.copy(m_listen_to.icon().pixmap().drawable(),
326 DefaultDepth(display, screen), screen); 326 DefaultDepth(display, screen), screen);
327 m_icon_pixmap.scale(width() - 4, height() - 4); 327 m_icon_pixmap.scale(width() - 4, height() - 4);
328 } else 328 } else
329 m_icon_pixmap.release(); 329 m_icon_pixmap.release();
330 330
331 if (m_listen_to.useMask()) { 331 if (m_listen_to.icon().mask().drawable() != None) {
332 m_icon_mask.copy(m_listen_to.iconMask().drawable(), 0, 0); 332 m_icon_mask.copy(m_listen_to.icon().mask().drawable(), 0, 0);
333 m_icon_mask.scale(width() - 4, height() - 4); 333 m_icon_mask.scale(width() - 4, height() - 4);
334 } else 334 } else
335 m_icon_mask.release(); 335 m_icon_mask.release();