aboutsummaryrefslogtreecommitdiff
path: root/src/IconButton.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconButton.cc')
-rw-r--r--src/IconButton.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/IconButton.cc b/src/IconButton.cc
index 8530c83..e3aae47 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -119,7 +119,7 @@ void IconButton::update(FbTk::Subject *subj) {
119 119
120 int screen = m_win.screen().screenNumber(); 120 int screen = m_win.screen().screenNumber();
121 121
122 if (m_use_pixmap && m_win.usePixmap()) { 122 if (m_use_pixmap && m_win.icon().pixmap().drawable() != None) {
123 // setup icon window 123 // setup icon window
124 m_icon_window.show(); 124 m_icon_window.show();
125 unsigned int w = width(); 125 unsigned int w = width();
@@ -138,7 +138,7 @@ void IconButton::update(FbTk::Subject *subj) {
138 138
139 m_icon_window.moveResize(iconx, icony, neww, newh); 139 m_icon_window.moveResize(iconx, icony, neww, newh);
140 140
141 m_icon_pixmap.copy(m_win.iconPixmap().drawable(), DefaultDepth(display, screen), screen); 141 m_icon_pixmap.copy(m_win.icon().pixmap().drawable(), DefaultDepth(display, screen), screen);
142 m_icon_pixmap.scale(m_icon_window.width(), m_icon_window.height()); 142 m_icon_pixmap.scale(m_icon_window.width(), m_icon_window.height());
143 143
144 // rotate the icon or not?? lets go not for now, and see what they say... 144 // rotate the icon or not?? lets go not for now, and see what they say...
@@ -153,8 +153,8 @@ void IconButton::update(FbTk::Subject *subj) {
153 m_icon_pixmap = 0; 153 m_icon_pixmap = 0;
154 } 154 }
155 155
156 if(m_use_pixmap && m_win.useMask()) { 156 if(m_icon_pixmap.drawable() && m_win.icon().mask().drawable() != None) {
157 m_icon_mask.copy(m_win.iconMask().drawable(), 0, 0); 157 m_icon_mask.copy(m_win.icon().mask().drawable(), 0, 0);
158 m_icon_mask.scale(m_icon_pixmap.width(), m_icon_pixmap.height()); 158 m_icon_mask.scale(m_icon_pixmap.width(), m_icon_pixmap.height());
159 m_icon_mask.rotate(orientation()); 159 m_icon_mask.rotate(orientation());
160 } else 160 } else
@@ -171,9 +171,6 @@ void IconButton::update(FbTk::Subject *subj) {
171 171
172#endif // SHAPE 172#endif // SHAPE
173 173
174 if (subj == &(m_win.titleSig()))
175 setText(m_win.title());
176
177 if (subj != 0) { 174 if (subj != 0) {
178 setupWindow(); 175 setupWindow();
179 } else { 176 } else {