X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.cpp;h=0138ec2af1a20f401b262b2b7d1bffefeac2a6eb;hb=39cf4c8d917dc60c087fb4af6885bfa78f6fba34;hp=b4ee82d10eff5d1e454ebf767430d0edd941ed17;hpb=d7ae291415a21cc886fe318070b41ac8d3e57a30;p=libs%2Fgltk.git diff --git a/source/style.cpp b/source/style.cpp index b4ee82d..0138ec2 100644 --- a/source/style.cpp +++ b/source/style.cpp @@ -6,10 +6,19 @@ using namespace std; namespace Msp { namespace GLtk { -Style::Style(): - font(0) +Style::Style(Resources &r): + font(&r.get_default_font()) { } +const Part *Style::get_part(const string &name) const +{ + for(PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i) + if(i->get_name()==name) + return &*i; + + return 0; +} + Style::Loader::Loader(Style &s, Resources &r): style(s), @@ -17,12 +26,20 @@ Style::Loader::Loader(Style &s, Resources &r): { add("font", &Style::font); add("font_color", &Loader::font_color); - add("part", &Loader::part); + add("part", static_cast(&Loader::part)); + add("part", static_cast(&Loader::part)); + // Deprecated alias + add("special", static_cast(&Loader::part)); } void Style::Loader::font_color(float r, float g, float b) { - style.font_color=GL::Color(r, g, b); + style.font_color = GL::Color(r, g, b); +} + +void Style::Loader::part() +{ + part(string()); } void Style::Loader::part(const string &n)