archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: use rect size macros for the interface

Browse Source
This commit is contained in:
Campbell Barton
2012-08-21 19:35:06 +00:00
parent dd21def25d
commit abd031bb4e
6 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/interface/interface_draw.c
View File

@@ -493,8 +493,8 @@ static void ui_draw_but_CHARTAB(uiBut *but)
charmax = G.charmax = 0xffff;
/* Calculate the size of the button */
width = absBLI_RCT_SIZE_X(rect);
height = absBLI_RCT_SIZE_Y(rect);
width = abs(BLI_RCT_SIZE_X(rect));
height = abs(BLI_RCT_SIZE_Y(rect));
butw = floor(width / 12);
buth = floor(height / 6);
@@ -1371,8 +1371,11 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *rect
scissor_new.xmax = ar->winrct.xmin + rect->xmax;
scissor_new.ymax = ar->winrct.ymin + rect->ymax;
BLI_rcti_isect(&scissor_new, &ar->winrct, &scissor_new);
glScissor(scissor_new.xmin, scissor_new.ymin, scissor_new.xmax - scissor_new.xmin, scissor_new.ymax - scissor_new.ymin);
glScissor(scissor_new.xmin,
scissor_new.ymin,
BLI_RCT_SIZE_X(&scissor_new),
BLI_RCT_SIZE_Y(&scissor_new));
/* calculate offset and zoom */
zoomx = (BLI_RCT_SIZE_X(rect) - 2.0f * but->aspect) / BLI_RCT_SIZE_X(&cumap->curr);
zoomy = (BLI_RCT_SIZE_Y(rect) - 2.0f * but->aspect) / BLI_RCT_SIZE_Y(&cumap->curr);