nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated text alignment

Browse source
This commit is contained in:
fluxgen 2001-12-13 22:18:02 +00:00
parent 5292c3e7ad
commit be57c0510d
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/Theme.cc
View file

@ -271,7 +271,7 @@ void Theme::freeTabStyle() {
XFreeFont(m_display, m_windowstyle.tab.font.fontstruct);
if (m_windowstyle.tab.rot_font)
XRotUnloadFont(m_display, m_windowstyle.tab.rot_font);
Misc::XRotUnloadFont(m_display, m_windowstyle.tab.rot_font);
XFreeGC(m_display, m_windowstyle.tab.l_text_focus_gc);
@ -346,27 +346,27 @@ void Theme::loadMenuStyle() {
"Menu.Title.Justify", &value_type, &value)) {
if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
m_menustyle.titlefont.justify = FFont::Right;
m_menustyle.titlefont.justify = Misc::Font::RIGHT;
else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
m_menustyle.titlefont.justify = FFont::Center;
m_menustyle.titlefont.justify = Misc::Font::CENTER;
else
m_menustyle.titlefont.justify = FFont::Left;
m_menustyle.titlefont.justify = Misc::Font::LEFT;
} else
m_menustyle.titlefont.justify = FFont::Left;
m_menustyle.titlefont.justify = Misc::Font::LEFT;
if (XrmGetResource(m_database, "menu.frame.justify",
"Menu.Frame.Justify", &value_type, &value)) {
if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
m_menustyle.framefont.justify = FFont::Right;
m_menustyle.framefont.justify = Misc::Font::RIGHT;
else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
m_menustyle.framefont.justify = FFont::Center;
m_menustyle.framefont.justify = Misc::Font::CENTER;
else
m_menustyle.framefont.justify = FFont::Left;
m_menustyle.framefont.justify = Misc::Font::LEFT;
} else
m_menustyle.framefont.justify = FFont::Left;
m_menustyle.framefont.justify = Misc::Font::LEFT;
if (XrmGetResource(m_database, "menu.bullet", "Menu.Bullet",
&value_type, &value)) {
@ -502,13 +502,13 @@ void Theme::loadWindowStyle() {
if (XrmGetResource(m_database, "window.justify", "Window.Justify",
&value_type, &value)) {
if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
m_windowstyle.font.justify = FFont::Right;
m_windowstyle.font.justify = Misc::Font::RIGHT;
else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
m_windowstyle.font.justify = FFont::Center;
m_windowstyle.font.justify = Misc::Font::CENTER;
else
m_windowstyle.font.justify = FFont::Left;
m_windowstyle.font.justify = Misc::Font::LEFT;
} else
m_windowstyle.font.justify = FFont::Left;
m_windowstyle.font.justify = Misc::Font::LEFT;
}
@ -583,22 +583,22 @@ void Theme::loadTabStyle() {
// TODO: add extra checking
if (XrmGetResource(m_database, "window.tab.font", "Window.Tab.Font",
&value_type, &value)) {
if (! (m_windowstyle.tab.rot_font = XRotLoadFont(m_display, value.addr, 90.0)) )
m_windowstyle.tab.rot_font = XRotLoadFont(m_display, "fixed", 90);
if (! (m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, value.addr, 90.0)) )
m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, "fixed", 90);
} else
m_windowstyle.tab.rot_font = XRotLoadFont(m_display, "fixed", 90);
m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, "fixed", 90);
if (XrmGetResource(m_database, "window.tab.justify", "Window.Tab.Justify",
&value_type, &value)) {
if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
m_windowstyle.tab.font.justify = FFont::Right;
m_windowstyle.tab.font.justify = Misc::Font::RIGHT;
else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
m_windowstyle.tab.font.justify = FFont::Center;
m_windowstyle.tab.font.justify = Misc::Font::CENTER;
else
m_windowstyle.tab.font.justify = FFont::Left;
m_windowstyle.tab.font.justify = Misc::Font::LEFT;
} else
m_windowstyle.tab.font.justify = FFont::Left;
m_windowstyle.tab.font.justify = Misc::Font::LEFT;
}
@ -655,13 +655,13 @@ void Theme::loadToolbarStyle() {
if (XrmGetResource(m_database, "toolbar.justify",
"Toolbar.Justify", &value_type, &value)) {
if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
m_toolbarstyle.font.justify = FFont::Right;
m_toolbarstyle.font.justify = Misc::Font::RIGHT;
else if (strstr(value.addr, "center") || strstr(value.addr, "Center"))
m_toolbarstyle.font.justify = FFont::Center;
m_toolbarstyle.font.justify = Misc::Font::CENTER;
else
m_toolbarstyle.font.justify = FFont::Left;
m_toolbarstyle.font.justify = Misc::Font::LEFT;
} else
m_toolbarstyle.font.justify = FFont::Left;
m_toolbarstyle.font.justify = Misc::Font::LEFT;
}