diff options
author | Ton Roosendaal <ton@blender.org> | 2011-01-20 19:29:43 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-01-20 19:29:43 +0300 |
commit | 2e8c93b663549d606425b3f20d87989c3439a381 (patch) | |
tree | 63bed9b51c00eb141de16062b1b2e8026a7187c9 /source | |
parent | 2e436acff07917b4c94f3f1cdb87d940c1f1492f (diff) |
Bugfix #25619
Paint modes: toolbar showed the preview image with double scaling applied,
so if UI zoomed in the image grew outside boundary.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index cf29794434e..09d388c3052 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -746,7 +746,7 @@ static void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol) #define PREVIEW_PAD 4 -static void widget_draw_preview(BIFIconID icon, float aspect, float UNUSED(alpha), rcti *rect) +static void widget_draw_preview(BIFIconID icon, float UNUSED(alpha), rcti *rect) { int w, h, size; @@ -762,7 +762,7 @@ static void widget_draw_preview(BIFIconID icon, float aspect, float UNUSED(alpha int x = rect->xmin + w/2 - size/2; int y = rect->ymin + h/2 - size/2; - UI_icon_draw_preview_aspect_size(x, y, icon, aspect, size); + UI_icon_draw_preview_aspect_size(x, y, icon, 1.0f, size); } } @@ -776,7 +776,7 @@ static void widget_draw_icon(uiBut *but, BIFIconID icon, float alpha, rcti *rect float aspect, height; if (but->flag & UI_ICON_PREVIEW) { - widget_draw_preview(icon, but->block->aspect, alpha, rect); + widget_draw_preview(icon, alpha, rect); return; } @@ -3118,7 +3118,7 @@ void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, char *name, int iconi wt->state(wt, state); wt->draw(&wt->wcol, rect, 0, 0); - widget_draw_preview(iconid, 1.f, 1.f, rect); + widget_draw_preview(iconid, 1.0f, rect); if (state == UI_ACTIVE) glColor3ubv((unsigned char*)wt->wcol.text); |