diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-09-10 07:24:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-10 07:37:53 +0400 |
commit | 1b94b3d49c83db16297bd445b19e7384084386d4 (patch) | |
tree | 2e347f03ec89540e43bfbb5ed83a97c95f0692c1 /source/blender/editors | |
parent | 5202fca6d51f31fab102d3a925df02efd5c934f5 (diff) |
WM: Add utility wmOrtho2_*** funcs
Currently there are inconsistencies with pixel alignment.
but this commit has no functional changes.
- wmOrtho2_region_ui for UI/Text.
- wmOrtho2_region_pixelspace for 2D drawing.
- wmOrtho2_pixelspace - when the region isn't used.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 3 |
4 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 695c8866d08..b987f970b9e 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1347,8 +1347,8 @@ void uiDrawBlock(const bContext *C, uiBlock *block) glMatrixMode(GL_MODELVIEW); glPushMatrix(); glLoadIdentity(); - - wmOrtho2(-0.01f, ar->winx - 0.01f, -0.01f, ar->winy - 0.01f); + + wmOrtho2_region_ui(ar); /* back */ if (block->flag & UI_BLOCK_RADIAL) diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 1960c77bc95..efcbc2ab4d5 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1020,7 +1020,7 @@ static void ui_searchbox_region_draw_cb(const bContext *UNUSED(C), ARegion *ar) uiSearchboxData *data = ar->regiondata; /* pixel space */ - wmOrtho2(-0.01f, ar->winx - 0.01f, -0.01f, ar->winy - 0.01f); + wmOrtho2_region_ui(ar); if (data->noback == false) ui_draw_search_back(NULL, NULL, &data->bbox); /* style not used yet */ diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 05418d8d451..739e7be7328 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -107,10 +107,7 @@ static void region_draw_emboss(ARegion *ar, rcti *scirct) void ED_region_pixelspace(ARegion *ar) { - int width = BLI_rcti_size_x(&ar->winrct) + 1; - int height = BLI_rcti_size_y(&ar->winrct) + 1; - - wmOrtho2(-GLA_PIXEL_OFS, (float)width - GLA_PIXEL_OFS, -GLA_PIXEL_OFS, (float)height - GLA_PIXEL_OFS); + wmOrtho2_region_pixelspace(ar); glLoadIdentity(); } diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index b760d9f5aa8..0358c1abce2 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -3056,7 +3056,8 @@ void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode, b glaDefine2DArea(&ar->winrct); /* ortho at pixel level curarea */ - wmOrtho2(-GLA_PIXEL_OFS, ar->winx - GLA_PIXEL_OFS, -GLA_PIXEL_OFS, ar->winy - GLA_PIXEL_OFS); + /* almost #wmOrtho2_region_pixelspace, but no +1 px */ + wmOrtho2_pixelspace(ar->winx, ar->winy); x = (ar->winx - snode->zoom * ibuf->x) / 2 + snode->xof; y = (ar->winy - snode->zoom * ibuf->y) / 2 + snode->yof; |