nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
markt 2006-12-29 03:05:53 +00:00
parent a58453fac2
commit 7a9fcd66fd
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0rc3: 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: *06/12/28:
* Allow focus to revert to stuck windows (Mark) * Allow focus to revert to stuck windows (Mark)
FocusControl.cc FocusControl.cc

2
src/Remember.cc
View file

@ -126,7 +126,7 @@ private:
FbTk::Menu *createRememberMenu(BScreen &screen) { FbTk::Menu *createRememberMenu(BScreen &screen) {
// each fluxboxwindow has its own windowmenu // each fluxboxwindow has its own windowmenu
// so we also create a remember menu just for it... // 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 // if enabled, then we want this to be a unavailable menu
/* /*

3
src/Toolbar.cc
View file

@ -640,7 +640,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
frame.width = (head_w - 2*border_width) * (*m_rc_width_percent) / 100; frame.width = (head_w - 2*border_width) * (*m_rc_width_percent) / 100;
//!! TODO: change this //!! TODO: change this
// max height of each toolbar items font... // 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) if (theme().height() > 0)
max_height = theme().height(); max_height = theme().height();
@ -650,7 +650,6 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
frame.height = max_height; frame.height = max_height;
frame.height += 2;
frame.height += (frame.bevel_w * 2); frame.height += (frame.bevel_w * 2);
// should we flipp sizes? // should we flipp sizes?