summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--doc/asciidoc/fluxbox.txt7
-rw-r--r--src/Toolbar.cc2
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f66863..aae3c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/03/10: 3*07/03/10:
4 * Changed default toolbar layer to DOCK, as a large window could render
5 fluxbox useless to a new user otherwise (Mark)
6 Toolbar.cc doc/asciidoc/fluxbox.txt
4 * Fixed changing iconbar text padding requiring a toolbar refresh (Mark) 7 * Fixed changing iconbar text padding requiring a toolbar refresh (Mark)
5 IconbarTool.cc 8 IconbarTool.cc
6 * Fixed stealing focus from unmanaged windows (Mark) 9 * Fixed stealing focus from unmanaged windows (Mark)
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 5ee9745..d530584 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -732,7 +732,7 @@ session.screen0.slit.layer: <layer>
732session.screen0.toolbar.layer: <layer> 732session.screen0.toolbar.layer: <layer>
733 With these two resources, you can set the layer you want the toolbar and 733 With these two resources, you can set the layer you want the toolbar and
734 the slit to appear on. Please read the LAYER section for more information. 734 the slit to appear on. Please read the LAYER section for more information.
735 Default: Desktop 735 Default: Dock
736 736
737session.screen0.slit.placement: <placement> 737session.screen0.slit.placement: <placement>
738session.screen0.toolbar.placement: <placement> 738session.screen0.toolbar.placement: <placement>
@@ -954,8 +954,9 @@ session.screen0.colPlacementDirection: TopToBottom|BottomToTop
954 Default: LeftToRight/TopToBottom 954 Default: LeftToRight/TopToBottom
955 955
956session.screen0.fullMaximization: <boolean> 956session.screen0.fullMaximization: <boolean>
957 If this setting is enabled, windows will maximize over the toolbar and 957 If this setting is enabled, windows will maximize over the toolbar, slit,
958 slit, no matter what their individual settings are. Default: False 958 and any other window that creates a strut, no matter what their individual
959 settings are. Default: False
959 960
960session.screen0.rootCommand: <command> 961session.screen0.rootCommand: <command>
961 This runs a command when fluxbox starts, intended for setting a default 962 This runs a command when fluxbox starts, intended for setting a default
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 4d2f191..6063b5e 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -229,7 +229,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
229 scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"), 229 scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"),
230 m_rc_alpha(scrn.resourceManager(), 255, 230 m_rc_alpha(scrn.resourceManager(), 255,
231 scrn.name() + ".toolbar.alpha", scrn.altName() + ".Toolbar.Alpha"), 231 scrn.name() + ".toolbar.alpha", scrn.altName() + ".Toolbar.Alpha"),
232 m_rc_layernum(scrn.resourceManager(), Layer(Layer::DESKTOP), 232 m_rc_layernum(scrn.resourceManager(), Layer(Layer::DOCK),
233 scrn.name() + ".toolbar.layer", scrn.altName() + ".Toolbar.Layer"), 233 scrn.name() + ".toolbar.layer", scrn.altName() + ".Toolbar.Layer"),
234 m_rc_on_head(scrn.resourceManager(), 0, 234 m_rc_on_head(scrn.resourceManager(), 0,
235 scrn.name() + ".toolbar.onhead", scrn.altName() + ".Toolbar.onHead"), 235 scrn.name() + ".toolbar.onhead", scrn.altName() + ".Toolbar.onHead"),