diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-02-13 02:24:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-13 02:37:27 +0400 |
commit | d4c87f2f79b674963a73ceee154226a1cd6d2acc (patch) | |
tree | 9e164c34acf351a62c6ffd463c73e91f9b7643ff /source | |
parent | e43c3ad88af70617f7708a82c0189f202681ac67 (diff) |
Code cleanup: remove unused button aspect
Diffstat (limited to 'source')
6 files changed, 9 insertions, 12 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 80311a64e23..ebcd372ec94 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2907,7 +2907,6 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str, but->lockstr = block->lockstr; but->dt = block->dt; - but->aspect = 1.0f; /* XXX block->aspect; */ but->block = block; /* pointer back, used for frontbuffer status, and picker */ if ((block->flag & UI_BUT_ALIGN) && ui_but_can_align(but)) diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index dda02ebde6c..1e2a8baf141 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1195,10 +1195,10 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti BLI_rcti_size_y(&scissor_new)); /* calculate offset and zoom */ - zoomx = (BLI_rcti_size_x(rect) - 2.0f * but->aspect) / BLI_rctf_size_x(&cumap->curr); - zoomy = (BLI_rcti_size_y(rect) - 2.0f * but->aspect) / BLI_rctf_size_y(&cumap->curr); - offsx = cumap->curr.xmin - but->aspect / zoomx; - offsy = cumap->curr.ymin - but->aspect / zoomy; + zoomx = (BLI_rcti_size_x(rect) - 2.0f) / BLI_rctf_size_x(&cumap->curr); + zoomy = (BLI_rcti_size_y(rect) - 2.0f) / BLI_rctf_size_y(&cumap->curr); + offsx = cumap->curr.xmin - (1.0f / zoomx); + offsy = cumap->curr.ymin - (1.0f / zoomy); /* backdrop */ if (but->a1 == UI_GRAD_H) { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index c3d83438968..ec6065c0cfd 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3594,7 +3594,7 @@ static bool ui_numedit_but_SLI(uiBut *but, uiHandleButtonData *data, ui_mouse_scale_warp(data, mx, mx, &mx_fl, &my_fl, shift); if (but->type == NUMSLI) { - offs = (BLI_rctf_size_y(&but->rect) / 2.0f) * but->aspect; + offs = (BLI_rctf_size_y(&but->rect) / 2.0f); deler = BLI_rctf_size_x(&but->rect) - offs; } else if (but->type == SCROLL) { @@ -3603,7 +3603,7 @@ static bool ui_numedit_but_SLI(uiBut *but, uiHandleButtonData *data, offs = 0.0; } else { - offs = (BLI_rctf_size_y(&but->rect) / 2.0f) * but->aspect; + offs = (BLI_rctf_size_y(&but->rect) / 2.0f); deler = (BLI_rctf_size_x(&but->rect) - offs); } @@ -3616,11 +3616,11 @@ static bool ui_numedit_but_SLI(uiBut *but, uiHandleButtonData *data, if (ui_is_a_warp_but(but)) { /* OK but can go outside bounds */ if (is_horizontal) { - data->ungrab_mval[0] = (but->rect.xmin + offs / but->aspect) + (f * deler); + data->ungrab_mval[0] = (but->rect.xmin + offs) + (f * deler); data->ungrab_mval[1] = BLI_rctf_cent_y(&but->rect); } else { - data->ungrab_mval[1] = (but->rect.ymin + offs / but->aspect) + (f * deler); + data->ungrab_mval[1] = (but->rect.ymin + offs) + (f * deler); data->ungrab_mval[0] = BLI_rctf_cent_x(&but->rect); } BLI_rctf_clamp_pt_v(&but->rect, data->ungrab_mval); diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 958e0d979aa..d3378af3de7 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -196,7 +196,6 @@ struct uiBut { */ float a2; - float aspect; unsigned char col[4]; uiButHandleFunc func; diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 2d0bb488342..67ae883ba7e 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1379,7 +1379,6 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, BLI_rctf_translate(&bt->rect, xof, yof); - bt->aspect = 1.0f; /* ui_check_but recalculates drawstring size in pixels */ ui_check_but(bt); } diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index e9b658aa9aa..d19b16250cd 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1254,7 +1254,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b pos = but->pos; if (pos >= but->ofs) { if (drawstr[0] != 0) { - t = BLF_width(fstyle->uifont_id, drawstr + but->ofs, pos - but->ofs) / but->aspect; + t = BLF_width(fstyle->uifont_id, drawstr + but->ofs, pos - but->ofs); } glColor3f(0.20, 0.6, 0.9); |