render code fixes
Dana Jansens danakj@orodu.net
5 files changed,
8 insertions(+),
8 deletions(-)
M
otk/focuslabel.cc
→
otk/focuslabel.cc
@@ -29,7 +29,7 @@ setUnfocusTexture(style->labelUnfocusBackground());
} -void FocusLabel::renderForeground(void) +void FocusLabel::renderForeground() { const Font *ft = style()->labelFont(); RenderColor *text_color = (isFocused() ? style()->textFocusColor()
M
otk/focuslabel.hh
→
otk/focuslabel.hh
@@ -16,7 +16,7 @@
inline const ustring &getText(void) const { return _text; } void setText(const ustring &text) { _text = text; _dirty = true; } - void renderForeground(void); + virtual void renderForeground(void); virtual void setStyle(RenderStyle *style);
M
otk/otk_test.cc
→
otk/otk_test.cc
@@ -15,7 +15,7 @@
otk::AppWidget foo(&app); foo.resize(600, 500); - foo.setTexture(app.getStyle()->titlebarFocusBackground()); +// foo.setTexture(app.getStyle()->titlebarFocusBackground()); // foo.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground()); foo.setBevelWidth(2);@@ -36,10 +36,10 @@ right.setStretchableVert(true);
right.setWidth(300); right.setTexture(app.getStyle()->titlebarFocusBackground()); right.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground()); - otk::Button iconb(&left); iconb.resize(40,20); - otk::FocusWidget label(&left); + +/* otk::FocusWidget label(&left); otk::Button maxb(&left); otk::Button closeb(&left);@@ -59,7 +59,7 @@ maxb.setText("bar");
// fixed size closeb.setText("fuubar"); - +*/ otk::FocusWidget rblef(&right); otk::Button rbutt1(&right); otk::Button rbutt2(&right);
M
otk/rendercontrol.cc
→
otk/rendercontrol.cc
@@ -99,7 +99,7 @@ (FcChar8*)string.c_str(), string.bytes());
else XftDrawString8(d, &c, font._xftfont, x, font._xftfont->ascent + y, (FcChar8*)string.c_str(), string.bytes()); - + printf("DRAW A STRING!: %s\n", string.c_str()); return; }
M
otk/widget.hh
→
otk/widget.hh
@@ -133,7 +133,7 @@ virtual void adjustHorz(void);
virtual void adjustVert(void); virtual void internalResize(int width, int height); virtual void render(void); - virtual void renderForeground(void) {} // for overriding + virtual void renderForeground() {} // for overriding Window _window;