petern
/
pplugins
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle widget outline in base class.

master
Peter Nelson 2013-02-05 19:15:41 +00:00
parent cac5f476d5
commit ceafbff5f4
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pui/knob.cpp
View File

@ -144,5 +144,6 @@ void Knob::OnPaint(const PUi *pui) const
pui->font->Render(tmp); pui->font->Render(tmp);
glPopMatrix(); glPopMatrix();
Widget::OnPaint(pui);
} }

10
pui/slider.cpp
View File

@ -232,14 +232,6 @@ void VSlider::OnPaint(const PUi *pui) const
pui->font->Render(tmp); pui->font->Render(tmp);
glPopMatrix(); glPopMatrix();
if (this->active) { Widget::OnPaint(pui);
glBegin(GL_LINE_LOOP);
glColor4f(1.f, 1.f, 1.0f, 0.25f);
glVertex2f( x + .5f, y + .5f);
glVertex2f( x + .5f, h + y - .5f);
glVertex2f(w + x - .5f, h + y - .5f);
glVertex2f(w + x - .5f, y + .5f);
glEnd();
}
} }

13
pui/widget.cpp
View File

@ -24,6 +24,19 @@ void Widget::Pad(int xpad, int ypad)
this->h -= ypad + ypad; this->h -= ypad + ypad;
} }
void Widget::OnPaint(const PUi *pui) const
{
if (this->active) {
glBegin(GL_LINE_LOOP);
glColor4f(1.f, 1.f, 1.0f, 0.25f);
glVertex2f( x + .5f, y + .5f);
glVertex2f( x + .5f, h + y - .5f);
glVertex2f(w + x - .5f, h + y - .5f);
glVertex2f(w + x - .5f, y + .5f);
glEnd();
}
}
void Frame::OnPaint(const PUi *pui) const void Frame::OnPaint(const PUi *pui) const
{ {
glBegin(GL_QUADS); glBegin(GL_QUADS);

2
pui/widget.h
View File

@ -47,7 +47,7 @@ struct Widget : Rect {
virtual float GetNewValue(int x, int y) { return this->value; } virtual float GetNewValue(int x, int y) { return this->value; }
virtual bool SetValue(float newvalue); virtual bool SetValue(float newvalue);
virtual void OnPaint(const PUi *pui) const {} virtual void OnPaint(const PUi *pui) const;
void Pad(int xpad, int ypad); void Pad(int xpad, int ypad);
}; };