don't add 2 pixels to toolbar.height from init file; oh, and I named the remember menu to help debugging
This commit is contained in:
parent
a58453fac2
commit
7a9fcd66fd
3 changed files with 5 additions and 3 deletions
|
@ -1,5 +1,8 @@
|
|||
(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
|
||||
|
|
|
@ -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
|
||||
/*
|
||||
|
|
|
@ -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?
|
||||
|
|
Loading…
Reference in a new issue