aboutsummaryrefslogtreecommitdiff
path: root/src/Theme.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Theme.cc')
-rw-r--r--src/Theme.cc48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index 80ab585..564a157 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -270,7 +270,7 @@ void Theme::freeTabStyle() {
270 XFreeFont(m_display, m_windowstyle.tab.font.fontstruct); 270 XFreeFont(m_display, m_windowstyle.tab.font.fontstruct);
271 271
272 if (m_windowstyle.tab.rot_font) 272 if (m_windowstyle.tab.rot_font)
273 Misc::XRotUnloadFont(m_display, m_windowstyle.tab.rot_font); 273 DrawUtil::XRotUnloadFont(m_display, m_windowstyle.tab.rot_font);
274 274
275 275
276 XFreeGC(m_display, m_windowstyle.tab.l_text_focus_gc); 276 XFreeGC(m_display, m_windowstyle.tab.l_text_focus_gc);
@@ -345,27 +345,27 @@ void Theme::loadMenuStyle() {
345 "Menu.Title.Justify", &value_type, &value)) { 345 "Menu.Title.Justify", &value_type, &value)) {
346 346
347 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 347 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
348 m_menustyle.titlefont.justify = Misc::Font::RIGHT; 348 m_menustyle.titlefont.justify = DrawUtil::Font::RIGHT;
349 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 349 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
350 m_menustyle.titlefont.justify = Misc::Font::CENTER; 350 m_menustyle.titlefont.justify = DrawUtil::Font::CENTER;
351 else 351 else
352 m_menustyle.titlefont.justify = Misc::Font::LEFT; 352 m_menustyle.titlefont.justify = DrawUtil::Font::LEFT;
353 353
354 } else 354 } else
355 m_menustyle.titlefont.justify = Misc::Font::LEFT; 355 m_menustyle.titlefont.justify = DrawUtil::Font::LEFT;
356 356
357 if (XrmGetResource(m_database, "menu.frame.justify", 357 if (XrmGetResource(m_database, "menu.frame.justify",
358 "Menu.Frame.Justify", &value_type, &value)) { 358 "Menu.Frame.Justify", &value_type, &value)) {
359 359
360 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 360 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
361 m_menustyle.framefont.justify = Misc::Font::RIGHT; 361 m_menustyle.framefont.justify = DrawUtil::Font::RIGHT;
362 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 362 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
363 m_menustyle.framefont.justify = Misc::Font::CENTER; 363 m_menustyle.framefont.justify = DrawUtil::Font::CENTER;
364 else 364 else
365 m_menustyle.framefont.justify = Misc::Font::LEFT; 365 m_menustyle.framefont.justify = DrawUtil::Font::LEFT;
366 366
367 } else 367 } else
368 m_menustyle.framefont.justify = Misc::Font::LEFT; 368 m_menustyle.framefont.justify = DrawUtil::Font::LEFT;
369 369
370 if (XrmGetResource(m_database, "menu.bullet", "Menu.Bullet", 370 if (XrmGetResource(m_database, "menu.bullet", "Menu.Bullet",
371 &value_type, &value)) { 371 &value_type, &value)) {
@@ -500,13 +500,13 @@ void Theme::loadWindowStyle() {
500 if (XrmGetResource(m_database, "window.justify", "Window.Justify", 500 if (XrmGetResource(m_database, "window.justify", "Window.Justify",
501 &value_type, &value)) { 501 &value_type, &value)) {
502 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 502 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
503 m_windowstyle.font.justify = Misc::Font::RIGHT; 503 m_windowstyle.font.justify = DrawUtil::Font::RIGHT;
504 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 504 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
505 m_windowstyle.font.justify = Misc::Font::CENTER; 505 m_windowstyle.font.justify = DrawUtil::Font::CENTER;
506 else 506 else
507 m_windowstyle.font.justify = Misc::Font::LEFT; 507 m_windowstyle.font.justify = DrawUtil::Font::LEFT;
508 } else 508 } else
509 m_windowstyle.font.justify = Misc::Font::LEFT; 509 m_windowstyle.font.justify = DrawUtil::Font::LEFT;
510 510
511} 511}
512 512
@@ -578,21 +578,21 @@ void Theme::loadTabStyle() {
578 // TODO: add extra checking 578 // TODO: add extra checking
579 if (XrmGetResource(m_database, "window.tab.font", "Window.Tab.Font", 579 if (XrmGetResource(m_database, "window.tab.font", "Window.Tab.Font",
580 &value_type, &value)) { 580 &value_type, &value)) {
581 if (! (m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, value.addr, 90.0)) ) 581 if (! (m_windowstyle.tab.rot_font = DrawUtil::XRotLoadFont(m_display, value.addr, 90.0)) )
582 m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, "fixed", 90); 582 m_windowstyle.tab.rot_font = DrawUtil::XRotLoadFont(m_display, "fixed", 90);
583 } else 583 } else
584 m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, "fixed", 90); 584 m_windowstyle.tab.rot_font = DrawUtil::XRotLoadFont(m_display, "fixed", 90);
585 585
586 if (XrmGetResource(m_database, "window.tab.justify", "Window.Tab.Justify", 586 if (XrmGetResource(m_database, "window.tab.justify", "Window.Tab.Justify",
587 &value_type, &value)) { 587 &value_type, &value)) {
588 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 588 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
589 m_windowstyle.tab.font.justify = Misc::Font::RIGHT; 589 m_windowstyle.tab.font.justify = DrawUtil::Font::RIGHT;
590 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 590 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
591 m_windowstyle.tab.font.justify = Misc::Font::CENTER; 591 m_windowstyle.tab.font.justify = DrawUtil::Font::CENTER;
592 else 592 else
593 m_windowstyle.tab.font.justify = Misc::Font::LEFT; 593 m_windowstyle.tab.font.justify = DrawUtil::Font::LEFT;
594 } else 594 } else
595 m_windowstyle.tab.font.justify = Misc::Font::LEFT; 595 m_windowstyle.tab.font.justify = DrawUtil::Font::LEFT;
596 596
597} 597}
598 598
@@ -649,13 +649,13 @@ void Theme::loadToolbarStyle() {
649 if (XrmGetResource(m_database, "toolbar.justify", 649 if (XrmGetResource(m_database, "toolbar.justify",
650 "Toolbar.Justify", &value_type, &value)) { 650 "Toolbar.Justify", &value_type, &value)) {
651 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 651 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
652 m_toolbarstyle.font.justify = Misc::Font::RIGHT; 652 m_toolbarstyle.font.justify = DrawUtil::Font::RIGHT;
653 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 653 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
654 m_toolbarstyle.font.justify = Misc::Font::CENTER; 654 m_toolbarstyle.font.justify = DrawUtil::Font::CENTER;
655 else 655 else
656 m_toolbarstyle.font.justify = Misc::Font::LEFT; 656 m_toolbarstyle.font.justify = DrawUtil::Font::LEFT;
657 } else 657 } else
658 m_toolbarstyle.font.justify = Misc::Font::LEFT; 658 m_toolbarstyle.font.justify = DrawUtil::Font::LEFT;
659 659
660} 660}
661 661