summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.cc18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index f0f0b82..6ef79ca 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.61 2003/02/23 00:49:01 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.62 2003/02/23 12:04:27 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -327,6 +327,14 @@ void Toolbar::delIcon(FluxboxWindow *w) {
327} 327}
328 328
329void Toolbar::reconfigure() { 329void Toolbar::reconfigure() {
330
331 if (do_auto_hide == false &&
332 do_auto_hide != screen().doToolbarAutoHide()) {
333 hide_timer.start();
334 }
335
336 do_auto_hide = screen().doToolbarAutoHide();
337
330 bool vertical = isVertical(); 338 bool vertical = isVertical();
331 339
332 if (m_iconbar.get()) 340 if (m_iconbar.get())
@@ -969,13 +977,19 @@ void Toolbar::keyPressEvent(XKeyEvent &ke) {
969 977
970 if (x < (signed) frame.bevel_w) 978 if (x < (signed) frame.bevel_w)
971 x = frame.bevel_w; 979 x = frame.bevel_w;
980 int dy = 1 + m_theme.font().ascent();
981 if (m_theme.font().isRotated()) {
982 int tmp = dy;
983 dy = frame.workspace_label_w - x;
984 x = tmp;
985 }
972 986
973 m_theme.font().drawText( 987 m_theme.font().drawText(
974 frame.workspace_label.window(), 988 frame.workspace_label.window(),
975 screen().getScreenNumber(), 989 screen().getScreenNumber(),
976 screen().getWindowStyle()->l_text_focus_gc, 990 screen().getWindowStyle()->l_text_focus_gc,
977 new_workspace_name.c_str(), l, 991 new_workspace_name.c_str(), l,
978 x, 1 + m_theme.font().ascent()); 992 x, dy);
979 993
980 XDrawRectangle(display, frame.workspace_label.window(), 994 XDrawRectangle(display, frame.workspace_label.window(),
981 screen().getWindowStyle()->l_text_focus_gc, x + tw, 0, 1, 995 screen().getWindowStyle()->l_text_focus_gc, x + tw, 0, 1,