diff options
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 19d7a4d..fca4666 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Toolbar.cc,v 1.99 2003/07/10 13:46:47 fluxgen Exp $ | 25 | // $Id: Toolbar.cc,v 1.100 2003/07/10 15:52:58 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Toolbar.hh" | 27 | #include "Toolbar.hh" |
28 | 28 | ||
@@ -264,6 +264,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi | |||
264 | m_strut(0), | 264 | m_strut(0), |
265 | m_rc_auto_hide(scrn.resourceManager(), false, | 265 | m_rc_auto_hide(scrn.resourceManager(), false, |
266 | scrn.name() + ".toolbar.autoHide", scrn.altName() + ".Toolbar.AutoHide"), | 266 | scrn.name() + ".toolbar.autoHide", scrn.altName() + ".Toolbar.AutoHide"), |
267 | m_rc_maximize_over(scrn.resourceManager(), false, | ||
268 | scrn.name() + ".toolbar.maxOver", scrn.altName() + ".Toolbar.MaxOver"), | ||
267 | m_rc_width_percent(scrn.resourceManager(), 65, | 269 | m_rc_width_percent(scrn.resourceManager(), 65, |
268 | scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"), | 270 | scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"), |
269 | m_rc_layernum(scrn.resourceManager(), Fluxbox::Layer(Fluxbox::instance()->getDesktopLayer()), | 271 | m_rc_layernum(scrn.resourceManager(), Fluxbox::Layer(Fluxbox::instance()->getDesktopLayer()), |
@@ -355,7 +357,7 @@ void Toolbar::updateStrut() { | |||
355 | clearStrut(); | 357 | clearStrut(); |
356 | // we should request space if we're in autohide mode or | 358 | // we should request space if we're in autohide mode or |
357 | // if the user dont want to request space for toolbar. | 359 | // if the user dont want to request space for toolbar. |
358 | if (doAutoHide()) { | 360 | if (doAutoHide() || *m_rc_maximize_over) { |
359 | if (had_strut) | 361 | if (had_strut) |
360 | screen().updateAvailableWorkspaceArea(); | 362 | screen().updateAvailableWorkspaceArea(); |
361 | return; | 363 | return; |
@@ -1380,7 +1382,8 @@ void Toolbar::setupMenus() { | |||
1380 | "Auto hide"), | 1382 | "Auto hide"), |
1381 | *m_rc_auto_hide, | 1383 | *m_rc_auto_hide, |
1382 | reconfig_toolbar_and_save_resource)); | 1384 | reconfig_toolbar_and_save_resource)); |
1383 | 1385 | menu.insert(new BoolMenuItem("Maximize Over", *m_rc_maximize_over, | |
1386 | reconfig_toolbar_and_save_resource)); | ||
1384 | menu.insert("Layer...", &tbar.layermenu()); | 1387 | menu.insert("Layer...", &tbar.layermenu()); |
1385 | 1388 | ||
1386 | if (tbar.screen().hasXinerama()) { | 1389 | if (tbar.screen().hasXinerama()) { |