don't add 2 pixels to toolbar.height from init file; oh, and I named the remember menu to help debugging

3 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6218194..da4ab47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *06/12/28:
+   * Don't add 2 pixels to a specified toolbar height, bug #1528646 (Mark)
+     Toolbar.cc
+*06/12/28:
    * Allow focus to revert to stuck windows (Mark)
      FocusControl.cc
 *06/12/27:
diff --git a/src/Remember.cc b/src/Remember.cc
index b705b0d..9035325 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -126,7 +126,7 @@ private:
 FbTk::Menu *createRememberMenu(BScreen &screen) {
     // each fluxboxwindow has its own windowmenu
     // so we also create a remember menu just for it...
-    FbTk::Menu *menu = screen.createMenu("");
+    FbTk::Menu *menu = screen.createMenu("Remember");
 
     // if enabled, then we want this to be a unavailable menu
     /*
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 6c4837a..3e825b8 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -640,7 +640,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
     frame.width = (head_w - 2*border_width) * (*m_rc_width_percent) / 100;
     //!! TODO: change this
     // max height of each toolbar items font...
-    unsigned int max_height = m_tool_factory.maxFontHeight();
+    unsigned int max_height = m_tool_factory.maxFontHeight() + 2;
 
     if (theme().height() > 0)
         max_height = theme().height();
@@ -650,7 +650,6 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
 
     frame.height = max_height;
 
-    frame.height += 2;
     frame.height += (frame.bevel_w * 2);
 
     // should we flipp sizes?