From b1d70e2c92c15d79ff0128d932b4e245c706a634 Mon Sep 17 00:00:00 2001 From: Gediminas Liktaras Date: Sun, 3 Apr 2011 13:19:53 +0200 Subject: bugfix: return 'height' if container is rotated vertically, closes #3195728 iconbar.iconWidth property was ignored due this bug. --- src/IconbarTool.cc | 4 ++-- 1 file 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) { void IconbarTool::resize(unsigned int width, unsigned int height) { m_icon_container.resize(width, height); - m_icon_container.setMaxTotalSize(m_icon_container.orientation() == FbTk::ROT0 || m_icon_container.orientation() ? width : height); + m_icon_container.setMaxTotalSize(m_icon_container.orientation() == FbTk::ROT0 || m_icon_container.orientation() == FbTk::ROT180 ? width : height); renderTheme(); } @@ -315,7 +315,7 @@ void IconbarTool::moveResize(int x, int y, unsigned int width, unsigned int height) { m_icon_container.moveResize(x, y, width, height); - m_icon_container.setMaxTotalSize(m_icon_container.orientation() == FbTk::ROT0 || m_icon_container.orientation() ? width : height); + m_icon_container.setMaxTotalSize(m_icon_container.orientation() == FbTk::ROT0 || m_icon_container.orientation() == FbTk::ROT180 ? width : height); renderTheme(); } -- cgit v0.11.2