aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2009-06-28 15:22:51 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2009-06-28 15:22:51 (GMT)
commit4e586cc1729fc1c7115dfc6d2499d40db559b8e1 (patch)
treeaf27f7170dcae0398f0466bbcb5c9ba524e069b0 /src/IconbarTool.cc
parentf3d61235f32437d726ec00ff5ac7708b0adc8724 (diff)
downloadfluxbox-4e586cc1729fc1c7115dfc6d2499d40db559b8e1.zip
fluxbox-4e586cc1729fc1c7115dfc6d2499d40db559b8e1.tar.bz2
previous fix for reverting iconbar to relative broke external tabs
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r--src/IconbarTool.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 03cadec..c84372f 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -249,7 +249,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme,
249 BScreen &screen, FbTk::Menu &menu): 249 BScreen &screen, FbTk::Menu &menu):
250 ToolbarItem(ToolbarItem::RELATIVE), 250 ToolbarItem(ToolbarItem::RELATIVE),
251 m_screen(screen), 251 m_screen(screen),
252 m_icon_container(parent), 252 m_icon_container(parent, false),
253 m_theme(theme), 253 m_theme(theme),
254 m_focused_theme(focused_theme), 254 m_focused_theme(focused_theme),
255 m_unfocused_theme(unfocused_theme), 255 m_unfocused_theme(unfocused_theme),
@@ -307,6 +307,7 @@ void IconbarTool::move(int x, int y) {
307 307
308void IconbarTool::resize(unsigned int width, unsigned int height) { 308void IconbarTool::resize(unsigned int width, unsigned int height) {
309 m_icon_container.resize(width, height); 309 m_icon_container.resize(width, height);
310 m_icon_container.setMaxTotalSize(m_icon_container.orientation() == FbTk::ROT0 || m_icon_container.orientation() ? width : height);
310 renderTheme(); 311 renderTheme();
311} 312}
312 313
@@ -314,6 +315,7 @@ void IconbarTool::moveResize(int x, int y,
314 unsigned int width, unsigned int height) { 315 unsigned int width, unsigned int height) {
315 316
316 m_icon_container.moveResize(x, y, width, height); 317 m_icon_container.moveResize(x, y, width, height);
318 m_icon_container.setMaxTotalSize(m_icon_container.orientation() == FbTk::ROT0 || m_icon_container.orientation() ? width : height);
317 renderTheme(); 319 renderTheme();
318} 320}
319 321