aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-01-05 01:39:19 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-01-05 01:39:19 (GMT)
commitac1bd7e0981222bf340ce7defb2bb8307d42a0a2 (patch)
treec8fb9c618184e7ac44f6138409cab3fab86b23e4 /src/IconbarTool.cc
parent60ba709c2f47cc2c7b877aef1b0f297b097853e5 (diff)
downloadfluxbox_pavel-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.zip
fluxbox_pavel-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.tar.bz2
update code to use ThemeProxy
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r--src/IconbarTool.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 76f6035..3984b52 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -252,7 +252,8 @@ private:
252 252
253}; // end anonymous namespace 253}; // end anonymous namespace
254 254
255IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, 255IconbarTool::IconbarTool(const FbTk::FbWindow &parent,
256 FbTk::ThemeProxy<IconbarTheme> &theme,
256 BScreen &screen, FbTk::Menu &menu): 257 BScreen &screen, FbTk::Menu &menu):
257 ToolbarItem(ToolbarItem::RELATIVE), 258 ToolbarItem(ToolbarItem::RELATIVE),
258 m_screen(screen), 259 m_screen(screen),
@@ -467,7 +468,7 @@ void IconbarTool::reset() {
467} 468}
468 469
469void IconbarTool::updateSizing() { 470void IconbarTool::updateSizing() {
470 m_icon_container.setBorderWidth(m_theme.border().width()); 471 m_icon_container.setBorderWidth(m_theme->border().width());
471 472
472 IconMap::iterator icon_it = m_icons.begin(); 473 IconMap::iterator icon_it = m_icons.begin();
473 const IconMap::iterator icon_it_end = m_icons.end(); 474 const IconMap::iterator icon_it_end = m_icons.end();
@@ -488,14 +489,14 @@ void IconbarTool::renderTheme() {
488 updateSizing(); 489 updateSizing();
489 490
490 // if we dont have any icons then we should render empty texture 491 // if we dont have any icons then we should render empty texture
491 if (!m_theme.emptyTexture().usePixmap()) { 492 if (!m_theme->emptyTexture().usePixmap()) {
492 m_empty_pm.reset( 0 ); 493 m_empty_pm.reset( 0 );
493 m_icon_container.setBackgroundColor(m_theme.emptyTexture().color()); 494 m_icon_container.setBackgroundColor(m_theme->emptyTexture().color());
494 } else { 495 } else {
495 m_empty_pm.reset(m_screen.imageControl(). 496 m_empty_pm.reset(m_screen.imageControl().
496 renderImage(m_icon_container.width(), 497 renderImage(m_icon_container.width(),
497 m_icon_container.height(), 498 m_icon_container.height(),
498 m_theme.emptyTexture(), orientation())); 499 m_theme->emptyTexture(), orientation()));
499 m_icon_container.setBackgroundPixmap(m_empty_pm); 500 m_icon_container.setBackgroundPixmap(m_empty_pm);
500 } 501 }
501 502