Mercurial > projects > mde
diff mde/gui/renderer/SimpleRenderer.d @ 114:b16a534f5302
Changes for tango r4201. Added override keyword in a lot of places.
author | Diggory Hardy <diggory.hardy@gmail.com> |
---|---|
date | Fri, 19 Dec 2008 15:15:06 +0000 |
parents | 1655693702fc |
children | 2ac3e0012788 |
line wrap: on
line diff
--- a/mde/gui/renderer/SimpleRenderer.d Fri Dec 19 10:32:28 2008 +0000 +++ b/mde/gui/renderer/SimpleRenderer.d Fri Dec 19 15:15:06 2008 +0000 @@ -35,7 +35,7 @@ } alias Border.BTYPE BTYPE; - Border getBorder (BTYPE type, bool wS, bool hS) { + override Border getBorder (BTYPE type, bool wS, bool hS) { Border border; with (border) { if (type & BTYPE.RESIZE) { @@ -53,7 +53,7 @@ return border; } - wdim layoutSpacing () { + override wdim layoutSpacing () { return 5; } @@ -61,10 +61,10 @@ //FIXME - make these do something // They should restrict the drawing of floating widgets to the floating area, for instance, // although this isn't strictly necessary. - void restrict (wdim x, wdim y, wdim w, wdim h) {} - void relax () {} + override void restrict (wdim x, wdim y, wdim w, wdim h) {} + override void relax () {} - void drawWindow (Border* border, wdim x, wdim y, wdim w, wdim h) { + override void drawWindow (Border* border, wdim x, wdim y, wdim w, wdim h) { glColor3f (0f, 0f, .8f); glRecti(x, y+h, x+w, y); @@ -97,7 +97,7 @@ glRecti(x+border.x1, y+h-border.y2, x+w-border.x2, y+border.y1); } - void drawSpacers (wdabs x, wdabs y, wdsize w, wdsize h, wdims cols, wdims rows) { + override void drawSpacers (wdabs x, wdabs y, wdsize w, wdsize h, wdims cols, wdims rows) { glColor3f (.2f, .2f, .2f); glBegin (GL_LINES); wdabs t = x - cast(wdim) 3; @@ -113,19 +113,19 @@ glEnd (); } - void drawWidgetBack (wdim x, wdim y, wdim w, wdim h) { + override void drawWidgetBack (wdim x, wdim y, wdim w, wdim h) { debug { glColor3f (0f, .2f, .2f); glRecti (x,y+h, x+w,y); } } - void drawBlank (wdim x, wdim y, wdim w, wdim h) { + override void drawBlank (wdim x, wdim y, wdim w, wdim h) { glColor3f (.4f, .4f, .4f); glRecti(x, y+h, x+w, y); } - void drawButton (wdim x, wdim y, wdim w, wdim h, bool pushed) { + override void drawButton (wdim x, wdim y, wdim w, wdim h, bool pushed) { if (pushed) glColor3f (1f, 0f, 1f); else @@ -133,13 +133,13 @@ glRecti(x, y+h, x+w, y); } - wdimPair getToggleSize () { + override wdimPair getToggleSize () { wdimPair r; r.x = 16; r.y = 16; return r; } - void drawToggle (wdim x, wdim y, bool state, bool pushed) { + override void drawToggle (wdim x, wdim y, bool state, bool pushed) { float c = pushed ? .7f : .5f; if (state) glColor3f (0f, c, 0f); @@ -148,7 +148,7 @@ glRecti (x+2,y+14, x+14,y+2); } - TextAdapter getAdapter (int col) { + override TextAdapter getAdapter (int col) { TextAdapter a; a.font = defaultFont; a.colour_ = Colour (col);