diff options
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 6ad8327..c5a20e2 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -63,7 +63,6 @@ | |||
63 | #endif // TIME_WITH_SYS_TIME | 63 | #endif // TIME_WITH_SYS_TIME |
64 | 64 | ||
65 | #include <iostream> | 65 | #include <iostream> |
66 | #include "misc.hh" | ||
67 | 66 | ||
68 | using namespace std; | 67 | using namespace std; |
69 | 68 | ||
@@ -645,11 +644,11 @@ void Toolbar::checkClock(Bool redraw, Bool date) { | |||
645 | } | 644 | } |
646 | 645 | ||
647 | switch (screen->getToolbarStyle()->font.justify) { | 646 | switch (screen->getToolbarStyle()->font.justify) { |
648 | case Misc::Font::RIGHT: | 647 | case DrawUtil::Font::RIGHT: |
649 | dx += frame.clock_w - l; | 648 | dx += frame.clock_w - l; |
650 | break; | 649 | break; |
651 | 650 | ||
652 | case Misc::Font::CENTER: | 651 | case DrawUtil::Font::CENTER: |
653 | dx += (frame.clock_w - l) / 2; | 652 | dx += (frame.clock_w - l) / 2; |
654 | break; | 653 | break; |
655 | default: //LEFT | 654 | default: //LEFT |
@@ -711,11 +710,11 @@ void Toolbar::redrawWindowLabel(Bool redraw) { | |||
711 | } | 710 | } |
712 | } | 711 | } |
713 | switch (screen->getToolbarStyle()->font.justify) { | 712 | switch (screen->getToolbarStyle()->font.justify) { |
714 | case Misc::Font::RIGHT: | 713 | case DrawUtil::Font::RIGHT: |
715 | dx += frame.window_label_w - l; | 714 | dx += frame.window_label_w - l; |
716 | break; | 715 | break; |
717 | 716 | ||
718 | case Misc::Font::CENTER: | 717 | case DrawUtil::Font::CENTER: |
719 | dx += (frame.window_label_w - l) / 2; | 718 | dx += (frame.window_label_w - l) / 2; |
720 | break; | 719 | break; |
721 | default: | 720 | default: |
@@ -789,11 +788,11 @@ void Toolbar::redrawWorkspaceLabel(Bool redraw) { | |||
789 | } | 788 | } |
790 | 789 | ||
791 | switch (screen->getToolbarStyle()->font.justify) { | 790 | switch (screen->getToolbarStyle()->font.justify) { |
792 | case Misc::Font::RIGHT: | 791 | case DrawUtil::Font::RIGHT: |
793 | dx += frame.workspace_label_w - l; | 792 | dx += frame.workspace_label_w - l; |
794 | break; | 793 | break; |
795 | 794 | ||
796 | case Misc::Font::CENTER: | 795 | case DrawUtil::Font::CENTER: |
797 | dx += (frame.workspace_label_w - l) / 2; | 796 | dx += (frame.workspace_label_w - l) / 2; |
798 | break; | 797 | break; |
799 | default: | 798 | default: |