aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-13 22:18:02 (GMT)
committerfluxgen <fluxgen>2001-12-13 22:18:02 (GMT)
commitbe57c0510d8b974f60644d425138d818097bd5b0 (patch)
tree1ecc0cf04dfcc0e0bd2621c7acb9ebc7035c8167
parent5292c3e7ad5f2e198e450709fb4d0c16f2a36025 (diff)
downloadfluxbox-be57c0510d8b974f60644d425138d818097bd5b0.zip
fluxbox-be57c0510d8b974f60644d425138d818097bd5b0.tar.bz2
Updated text alignment
-rw-r--r--src/Theme.cc48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index 5f54643..d477ecc 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -271,7 +271,7 @@ void Theme::freeTabStyle() {
271 XFreeFont(m_display, m_windowstyle.tab.font.fontstruct); 271 XFreeFont(m_display, m_windowstyle.tab.font.fontstruct);
272 272
273 if (m_windowstyle.tab.rot_font) 273 if (m_windowstyle.tab.rot_font)
274 XRotUnloadFont(m_display, m_windowstyle.tab.rot_font); 274 Misc::XRotUnloadFont(m_display, m_windowstyle.tab.rot_font);
275 275
276 276
277 XFreeGC(m_display, m_windowstyle.tab.l_text_focus_gc); 277 XFreeGC(m_display, m_windowstyle.tab.l_text_focus_gc);
@@ -346,27 +346,27 @@ void Theme::loadMenuStyle() {
346 "Menu.Title.Justify", &value_type, &value)) { 346 "Menu.Title.Justify", &value_type, &value)) {
347 347
348 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 348 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
349 m_menustyle.titlefont.justify = FFont::Right; 349 m_menustyle.titlefont.justify = Misc::Font::RIGHT;
350 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 350 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
351 m_menustyle.titlefont.justify = FFont::Center; 351 m_menustyle.titlefont.justify = Misc::Font::CENTER;
352 else 352 else
353 m_menustyle.titlefont.justify = FFont::Left; 353 m_menustyle.titlefont.justify = Misc::Font::LEFT;
354 354
355 } else 355 } else
356 m_menustyle.titlefont.justify = FFont::Left; 356 m_menustyle.titlefont.justify = Misc::Font::LEFT;
357 357
358 if (XrmGetResource(m_database, "menu.frame.justify", 358 if (XrmGetResource(m_database, "menu.frame.justify",
359 "Menu.Frame.Justify", &value_type, &value)) { 359 "Menu.Frame.Justify", &value_type, &value)) {
360 360
361 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 361 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
362 m_menustyle.framefont.justify = FFont::Right; 362 m_menustyle.framefont.justify = Misc::Font::RIGHT;
363 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 363 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
364 m_menustyle.framefont.justify = FFont::Center; 364 m_menustyle.framefont.justify = Misc::Font::CENTER;
365 else 365 else
366 m_menustyle.framefont.justify = FFont::Left; 366 m_menustyle.framefont.justify = Misc::Font::LEFT;
367 367
368 } else 368 } else
369 m_menustyle.framefont.justify = FFont::Left; 369 m_menustyle.framefont.justify = Misc::Font::LEFT;
370 370
371 if (XrmGetResource(m_database, "menu.bullet", "Menu.Bullet", 371 if (XrmGetResource(m_database, "menu.bullet", "Menu.Bullet",
372 &value_type, &value)) { 372 &value_type, &value)) {
@@ -502,13 +502,13 @@ void Theme::loadWindowStyle() {
502 if (XrmGetResource(m_database, "window.justify", "Window.Justify", 502 if (XrmGetResource(m_database, "window.justify", "Window.Justify",
503 &value_type, &value)) { 503 &value_type, &value)) {
504 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 504 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
505 m_windowstyle.font.justify = FFont::Right; 505 m_windowstyle.font.justify = Misc::Font::RIGHT;
506 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 506 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
507 m_windowstyle.font.justify = FFont::Center; 507 m_windowstyle.font.justify = Misc::Font::CENTER;
508 else 508 else
509 m_windowstyle.font.justify = FFont::Left; 509 m_windowstyle.font.justify = Misc::Font::LEFT;
510 } else 510 } else
511 m_windowstyle.font.justify = FFont::Left; 511 m_windowstyle.font.justify = Misc::Font::LEFT;
512 512
513} 513}
514 514
@@ -583,22 +583,22 @@ void Theme::loadTabStyle() {
583 // TODO: add extra checking 583 // TODO: add extra checking
584 if (XrmGetResource(m_database, "window.tab.font", "Window.Tab.Font", 584 if (XrmGetResource(m_database, "window.tab.font", "Window.Tab.Font",
585 &value_type, &value)) { 585 &value_type, &value)) {
586 if (! (m_windowstyle.tab.rot_font = XRotLoadFont(m_display, value.addr, 90.0)) ) 586 if (! (m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, value.addr, 90.0)) )
587 m_windowstyle.tab.rot_font = XRotLoadFont(m_display, "fixed", 90); 587 m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, "fixed", 90);
588 } else 588 } else
589 m_windowstyle.tab.rot_font = XRotLoadFont(m_display, "fixed", 90); 589 m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, "fixed", 90);
590 590
591 591
592 if (XrmGetResource(m_database, "window.tab.justify", "Window.Tab.Justify", 592 if (XrmGetResource(m_database, "window.tab.justify", "Window.Tab.Justify",
593 &value_type, &value)) { 593 &value_type, &value)) {
594 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 594 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
595 m_windowstyle.tab.font.justify = FFont::Right; 595 m_windowstyle.tab.font.justify = Misc::Font::RIGHT;
596 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 596 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
597 m_windowstyle.tab.font.justify = FFont::Center; 597 m_windowstyle.tab.font.justify = Misc::Font::CENTER;
598 else 598 else
599 m_windowstyle.tab.font.justify = FFont::Left; 599 m_windowstyle.tab.font.justify = Misc::Font::LEFT;
600 } else 600 } else
601 m_windowstyle.tab.font.justify = FFont::Left; 601 m_windowstyle.tab.font.justify = Misc::Font::LEFT;
602 602
603} 603}
604 604
@@ -655,13 +655,13 @@ void Theme::loadToolbarStyle() {
655 if (XrmGetResource(m_database, "toolbar.justify", 655 if (XrmGetResource(m_database, "toolbar.justify",
656 "Toolbar.Justify", &value_type, &value)) { 656 "Toolbar.Justify", &value_type, &value)) {
657 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 657 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
658 m_toolbarstyle.font.justify = FFont::Right; 658 m_toolbarstyle.font.justify = Misc::Font::RIGHT;
659 else if (strstr(value.addr, "center") || strstr(value.addr, "Center")) 659 else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
660 m_toolbarstyle.font.justify = FFont::Center; 660 m_toolbarstyle.font.justify = Misc::Font::CENTER;
661 else 661 else
662 m_toolbarstyle.font.justify = FFont::Left; 662 m_toolbarstyle.font.justify = Misc::Font::LEFT;
663 } else 663 } else
664 m_toolbarstyle.font.justify = FFont::Left; 664 m_toolbarstyle.font.justify = Misc::Font::LEFT;
665 665
666} 666}
667 667