diff options
author | markt <markt> | 2006-12-29 03:05:53 (GMT) |
---|---|---|
committer | markt <markt> | 2006-12-29 03:05:53 (GMT) |
commit | 7a9fcd66fd09f138485accb12f0bd71c81efd959 (patch) | |
tree | 95411c89607a63229ceef08b1390807412f3c199 /src | |
parent | a58453fac24c4c4b2987e9716d87ef3f59f312d8 (diff) | |
download | fluxbox-7a9fcd66fd09f138485accb12f0bd71c81efd959.zip fluxbox-7a9fcd66fd09f138485accb12f0bd71c81efd959.tar.bz2 |
don't add 2 pixels to toolbar.height from init file; oh, and I named the remember menu to help debugging
Diffstat (limited to 'src')
-rw-r--r-- | src/Remember.cc | 2 | ||||
-rw-r--r-- | src/Toolbar.cc | 3 |
2 files changed, 2 insertions, 3 deletions
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: | |||
126 | FbTk::Menu *createRememberMenu(BScreen &screen) { | 126 | FbTk::Menu *createRememberMenu(BScreen &screen) { |
127 | // each fluxboxwindow has its own windowmenu | 127 | // each fluxboxwindow has its own windowmenu |
128 | // so we also create a remember menu just for it... | 128 | // so we also create a remember menu just for it... |
129 | FbTk::Menu *menu = screen.createMenu(""); | 129 | FbTk::Menu *menu = screen.createMenu("Remember"); |
130 | 130 | ||
131 | // if enabled, then we want this to be a unavailable menu | 131 | // if enabled, then we want this to be a unavailable menu |
132 | /* | 132 | /* |
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) { | |||
640 | frame.width = (head_w - 2*border_width) * (*m_rc_width_percent) / 100; | 640 | frame.width = (head_w - 2*border_width) * (*m_rc_width_percent) / 100; |
641 | //!! TODO: change this | 641 | //!! TODO: change this |
642 | // max height of each toolbar items font... | 642 | // max height of each toolbar items font... |
643 | unsigned int max_height = m_tool_factory.maxFontHeight(); | 643 | unsigned int max_height = m_tool_factory.maxFontHeight() + 2; |
644 | 644 | ||
645 | if (theme().height() > 0) | 645 | if (theme().height() > 0) |
646 | max_height = theme().height(); | 646 | max_height = theme().height(); |
@@ -650,7 +650,6 @@ void Toolbar::setPlacement(Toolbar::Placement where) { | |||
650 | 650 | ||
651 | frame.height = max_height; | 651 | frame.height = max_height; |
652 | 652 | ||
653 | frame.height += 2; | ||
654 | frame.height += (frame.bevel_w * 2); | 653 | frame.height += (frame.bevel_w * 2); |
655 | 654 | ||
656 | // should we flipp sizes? | 655 | // should we flipp sizes? |