summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 32f1bcd..6bf5654 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.33 2002/10/13 21:51:12 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.34 2002/10/15 17:13:24 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -788,10 +788,10 @@ void Toolbar::redrawWorkspaceLabel(bool redraw) {
788 &ink, &logical); 788 &ink, &logical);
789 l = logical.width; 789 l = logical.width;
790 } else { 790 } else {
791 l = XTextWidth(screen->getWindowStyle()->font.fontstruct, 791 l = XTextWidth(screen->getToolbarStyle()->font.fontstruct,
792 screen->getCurrentWorkspace()->name().c_str(), dlen); 792 screen->getCurrentWorkspace()->name().c_str(), dlen);
793 } 793 }
794 794
795 l += (frame.bevel_w * 4); 795 l += (frame.bevel_w * 4);
796 796
797 if (l < frame.workspace_label_w) 797 if (l < frame.workspace_label_w)
@@ -1171,9 +1171,9 @@ void Toolbar::keyPressEvent(XKeyEvent *ke) {
1171 1171
1172 if (i18n->multibyte()) { 1172 if (i18n->multibyte()) {
1173 XmbDrawString(display, frame.workspace_label, 1173 XmbDrawString(display, frame.workspace_label,
1174 screen->getWindowStyle()->font.set, 1174 screen->getToolbarStyle()->font.set,
1175 screen->getWindowStyle()->l_text_focus_gc, x, 1 - 1175 screen->getWindowStyle()->l_text_focus_gc, x, 1 -
1176 screen->getWindowStyle()->font.set_extents->max_ink_extent.y, 1176 screen->getToolbarStyle()->font.set_extents->max_ink_extent.y,
1177 new_workspace_name.c_str(), l); 1177 new_workspace_name.c_str(), l);
1178 } else { 1178 } else {
1179 XDrawString(display, frame.workspace_label, 1179 XDrawString(display, frame.workspace_label,