aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.cc9
-rw-r--r--src/Toolbar.hh5
2 files changed, 9 insertions, 5 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()) {
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index b6732f4..59b1600 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -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.hh,v 1.37 2003/07/10 11:45:22 fluxgen Exp $ 25// $Id: Toolbar.hh,v 1.38 2003/07/10 15:52:58 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -36,6 +36,7 @@
36#include "XLayer.hh" 36#include "XLayer.hh"
37#include "XLayerItem.hh" 37#include "XLayerItem.hh"
38#include "LayerMenu.hh" 38#include "LayerMenu.hh"
39#include "Resource.hh"
39 40
40#include <memory> 41#include <memory>
41 42
@@ -201,7 +202,7 @@ private:
201 202
202 Strut *m_strut; ///< created and destroyed by BScreen 203 Strut *m_strut; ///< created and destroyed by BScreen
203 // resources 204 // resources
204 FbTk::Resource<bool> m_rc_auto_hide; 205 FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over;
205 FbTk::Resource<int> m_rc_width_percent; 206 FbTk::Resource<int> m_rc_width_percent;
206 FbTk::Resource<Fluxbox::Layer> m_rc_layernum; 207 FbTk::Resource<Fluxbox::Layer> m_rc_layernum;
207 FbTk::Resource<int> m_rc_on_head; 208 FbTk::Resource<int> m_rc_on_head;