aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGediminas Liktaras <gliktaras at gmail com>2011-04-03 11:19:53 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-04-03 11:20:35 (GMT)
commitb1d70e2c92c15d79ff0128d932b4e245c706a634 (patch)
tree36a5b8e60b25fa2b281cdd39886d60b8b696db66
parent40f8c35084a012f438ad654e047f3660939350c7 (diff)
downloadfluxbox_pavel-b1d70e2c92c15d79ff0128d932b4e245c706a634.zip
fluxbox_pavel-b1d70e2c92c15d79ff0128d932b4e245c706a634.tar.bz2
bugfix: return 'height' if container is rotated vertically, closes #3195728
iconbar.iconWidth property was ignored due this bug.
-rw-r--r--src/IconbarTool.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index dc0eaeb..28e4aeb 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -307,7 +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 m_icon_container.setMaxTotalSize(m_icon_container.orientation() == FbTk::ROT0 || m_icon_container.orientation() == FbTk::ROT180 ? width : height);
311 renderTheme(); 311 renderTheme();
312} 312}
313 313
@@ -315,7 +315,7 @@ void IconbarTool::moveResize(int x, int y,
315 unsigned int width, unsigned int height) { 315 unsigned int width, unsigned int height) {
316 316
317 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); 318 m_icon_container.setMaxTotalSize(m_icon_container.orientation() == FbTk::ROT0 || m_icon_container.orientation() == FbTk::ROT180 ? width : height);
319 renderTheme(); 319 renderTheme();
320} 320}
321 321