fix DOS when toolbar.button.borderWidth is large and toolbar.bevelWidth > 0

move transparency menu up with the other submenus

1 files changed, 3 insertions, 0 deletions

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index a1906c0..4a174bd 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -1034,6 +1034,7 @@ void Toolbar::rearrangeItems() {
             (*item_it)->hide();
             // make sure it still gets told the toolbar height
             tmpw = 1; tmph = height - 2*(bevel_width+borderW);
+            if (tmph >= (1<<30)) tmph = 1;
             FbTk::translateSize(orient, tmpw, tmph);
             (*item_it)->resize(tmpw, tmph);  // width of 0 changes to 1 anyway
             continue;
@@ -1070,6 +1071,8 @@ void Toolbar::rearrangeItems() {
             tmpw = itemw;
             tmph = height - size_offset;
         }
+        if (tmpw >= (1<<30)) tmpw = 1;
+        if (tmph >= (1<<30)) tmph = 1;
         next_x += tmpw + bevel_width;
         if (bevel_width != 0)
             next_x += 2*borderW;