diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-09 20:01:35 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-09 20:02:25 +0300 |
commit | 51737a2c8c7f6cdb305591c2a71fd93a8ac05b89 (patch) | |
tree | 00f333d2de045088378bdc4beb6e5146e32b7272 | |
parent | fc53c6f95383835f33222b4b445a8c244432c7a1 (diff) |
Immediate Mode: text_draw.c 2/2
Tackle the remaining parts of the code, mainly the commented out
function `draw_documentation`.
-rw-r--r-- | source/blender/editors/space_text/text_draw.c | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index d3756ec7cce..3607bf90543 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -968,26 +968,32 @@ static void draw_documentation(const SpaceText *st, ARegion *ar) boxh = (DOC_HEIGHT + 1) * (st->lheight_dpi + TXT_LINE_SPACING); /* Draw panel */ - UI_ThemeColor(TH_BACK); - glRecti(x, y, x + boxw, y - boxh); - UI_ThemeColor(TH_SHADE1); - glBegin(GL_LINE_LOOP); - glVertex2i(x, y); - glVertex2i(x + boxw, y); - glVertex2i(x + boxw, y - boxh); - glVertex2i(x, y - boxh); - glEnd(); - glBegin(GL_LINE_LOOP); - glVertex2i(x + boxw - 10, y - 7); - glVertex2i(x + boxw - 4, y - 7); - glVertex2i(x + boxw - 7, y - 2); - glEnd(); - glBegin(GL_LINE_LOOP); - glVertex2i(x + boxw - 10, y - boxh + 7); - glVertex2i(x + boxw - 4, y - boxh + 7); - glVertex2i(x + boxw - 7, y - boxh + 2); - glEnd(); - UI_ThemeColor(TH_TEXT); + unsigned int pos = add_attrib(immVertexFormat(), "pos", COMP_I32, 2, CONVERT_INT_TO_FLOAT); + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); + + immUniformThemeColor(TH_BACK); + immRecti(pos, x, y, x + boxw, y - boxh); + immUniformThemeColor(TH_SHADE1); + immBegin(GL_LINE_LOOP, 4); + immVertex2i(pos, x, y); + immVertex2i(pos, x + boxw, y); + immVertex2i(pos, x + boxw, y - boxh); + immVertex2i(pos, x, y - boxh); + immEnd(); + immBegin(GL_LINE_LOOP, 3); + immVertex2i(pos, x + boxw - 10, y - 7); + immVertex2i(pos, x + boxw - 4, y - 7); + immVertex2i(pos, x + boxw - 7, y - 2); + immEnd(); + immBegin(GL_LINE_LOOP, 3); + immVertex2i(pos, x + boxw - 10, y - boxh + 7); + immVertex2i(pos, x + boxw - 4, y - boxh + 7); + immVertex2i(pos, x + boxw - 7, y - boxh + 2); + immEnd(); + + immUnbindProgram(); + + UI_FontThemeColor(tdc.font_id, TH_TEXT); i = 0; br = DOC_WIDTH; lines = 0; // XXX -doc_scroll; for (p = docs; *p; p++) { |