Add setup_mini_font

This commit is contained in:
David Capello 2014-01-26 08:39:33 -03:00
parent 9423b967ab
commit 4e6320b03c
3 changed files with 14 additions and 9 deletions

View File

@ -397,15 +397,22 @@ void save_window_pos(Widget* window, const char *section)
set_config_rect(section, "WindowPos", window->getBounds()); set_config_rect(section, "WindowPos", window->getBounds());
} }
void setup_mini_look(Widget* widget) Widget* setup_mini_font(Widget* widget)
{ {
setup_look(widget, MiniLook); widget->setFont(((SkinTheme*)widget->getTheme())->getMiniFont());
return widget;
} }
void setup_look(Widget* widget, LookType lookType) Widget* setup_mini_look(Widget* widget)
{
return setup_look(widget, MiniLook);
}
Widget* setup_look(Widget* widget, LookType lookType)
{ {
SkinPropertyPtr skinProp = get_skin_property(widget); SkinPropertyPtr skinProp = get_skin_property(widget);
skinProp->setLook(lookType); skinProp->setLook(lookType);
return widget;
} }
void setup_bevels(Widget* widget, int b1, int b2, int b3, int b4) void setup_bevels(Widget* widget, int b1, int b2, int b3, int b4)

View File

@ -59,8 +59,9 @@ namespace app {
void load_window_pos(ui::Widget* window, const char *section); void load_window_pos(ui::Widget* window, const char *section);
void save_window_pos(ui::Widget* window, const char *section); void save_window_pos(ui::Widget* window, const char *section);
void setup_mini_look(ui::Widget* widget); ui::Widget* setup_mini_font(ui::Widget* widget);
void setup_look(ui::Widget* widget, skin::LookType lookType); ui::Widget* setup_mini_look(ui::Widget* widget);
ui::Widget* setup_look(ui::Widget* widget, skin::LookType lookType);
void setup_bevels(ui::Widget* widget, int b1, int b2, int b3, int b4); void setup_bevels(ui::Widget* widget, int b1, int b2, int b3, int b4);
void set_gfxicon_to_button(ui::ButtonBase* button, void set_gfxicon_to_button(ui::ButtonBase* button,

View File

@ -129,12 +129,9 @@ ColorBar::ColorBar(int align)
m_paletteView.setBgColor(((SkinTheme*)getTheme())->getColor(ThemeColor::TabSelectedFace)); m_paletteView.setBgColor(((SkinTheme*)getTheme())->getColor(ThemeColor::TabSelectedFace));
// Change labels foreground color // Change labels foreground color
setup_mini_look(&m_paletteButton); setup_mini_font(setup_mini_look(&m_paletteButton));
m_paletteButton.setFont(((SkinTheme*)getTheme())->getMiniFont());
m_paletteButton.Click.connect(Bind<void>(&ColorBar::onPaletteButtonClick, this)); m_paletteButton.Click.connect(Bind<void>(&ColorBar::onPaletteButtonClick, this));
setDoubleBuffered(true);
onColorButtonChange(getFgColor()); onColorButtonChange(getFgColor());
} }