aboutsummaryrefslogtreecommitdiff
path: root/src/IconButton.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconButton.cc')
-rw-r--r--src/IconButton.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/IconButton.cc b/src/IconButton.cc
index b00c335..5db7773 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -51,8 +51,8 @@
51IconButton::IconButton(const FbTk::FbWindow &parent, IconbarTheme &theme, 51IconButton::IconButton(const FbTk::FbWindow &parent, IconbarTheme &theme,
52 Focusable &win): 52 Focusable &win):
53 FbTk::TextButton(parent, theme.focusedText().font(), win.title()), 53 FbTk::TextButton(parent, theme.focusedText().font(), win.title()),
54 m_win(win), 54 m_win(win),
55 m_icon_window(*this, 1, 1, 1, 1, 55 m_icon_window(*this, 1, 1, 1, 1,
56 ExposureMask | ButtonPressMask | ButtonReleaseMask), 56 ExposureMask | ButtonPressMask | ButtonReleaseMask),
57 m_use_pixmap(true), 57 m_use_pixmap(true),
58 m_theme(theme), 58 m_theme(theme),
@@ -62,7 +62,7 @@ IconButton::IconButton(const FbTk::FbWindow &parent, IconbarTheme &theme,
62 m_win.titleSig().attach(this); 62 m_win.titleSig().attach(this);
63 m_win.focusSig().attach(this); 63 m_win.focusSig().attach(this);
64 m_win.attentionSig().attach(this); 64 m_win.attentionSig().attach(this);
65 65
66 FbTk::EventManager::instance()->add(*this, m_icon_window); 66 FbTk::EventManager::instance()->add(*this, m_icon_window);
67 67
68 reconfigTheme(); 68 reconfigTheme();
@@ -174,8 +174,8 @@ void IconButton::update(FbTk::Subject *subj) {
174 return; 174 return;
175 } 175 }
176 176
177 // we got signal that either title or 177 // we got signal that either title or
178 // icon pixmap was updated, 178 // icon pixmap was updated,
179 // so we refresh everything 179 // so we refresh everything
180 180
181 Display *display = FbTk::App::instance()->display(); 181 Display *display = FbTk::App::instance()->display();
@@ -197,7 +197,7 @@ void IconButton::update(FbTk::Subject *subj) {
197 197
198 FbTk::translateCoords(orientation(), iconx, icony, w, h); 198 FbTk::translateCoords(orientation(), iconx, icony, w, h);
199 FbTk::translatePosition(orientation(), iconx, icony, neww, newh, 0); 199 FbTk::translatePosition(orientation(), iconx, icony, neww, newh, 0);
200 200
201 m_icon_window.moveResize(iconx, icony, neww, newh); 201 m_icon_window.moveResize(iconx, icony, neww, newh);
202 202
203 m_icon_pixmap.copy(m_win.icon().pixmap().drawable(), 203 m_icon_pixmap.copy(m_win.icon().pixmap().drawable(),
@@ -254,7 +254,7 @@ void IconButton::drawText(int x, int y, FbTk::FbDrawable *drawable) {
254 else 254 else
255 FbTk::TextButton::drawText(1, y, drawable); 255 FbTk::TextButton::drawText(1, y, drawable);
256} 256}
257 257
258bool IconButton::setOrientation(FbTk::Orientation orient) { 258bool IconButton::setOrientation(FbTk::Orientation orient) {
259 if (orientation() == orient) 259 if (orientation() == orient)
260 return true; 260 return true;