diff options
author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
---|---|---|
committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/IconbarTool.cc | |
parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
download | fluxbox_lack-testing/argb.zip fluxbox_lack-testing/argb.tar.bz2 |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r-- | src/IconbarTool.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index 03cadec..90d4728 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc | |||
@@ -241,7 +241,7 @@ private: | |||
241 | Focusable &m_win; | 241 | Focusable &m_win; |
242 | }; | 242 | }; |
243 | 243 | ||
244 | }; // end anonymous namespace | 244 | } // end anonymous namespace |
245 | 245 | ||
246 | IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, | 246 | IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, |
247 | FbTk::ThemeProxy<IconbarTheme> &focused_theme, | 247 | FbTk::ThemeProxy<IconbarTheme> &focused_theme, |
@@ -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 | ||
308 | void IconbarTool::resize(unsigned int width, unsigned int height) { | 308 | void 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 | ||