diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-11-06 00:33:08 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-11-06 00:33:08 +0300 |
| commit | 9e611c5616aa27c43ed067d184f94e6e9c9f5ffc (patch) | |
| tree | cd28326cdcf24ae83f2ca64bc2b1ad1776101c02 /source/blender/editors | |
| parent | f0bc7f3261b823fe4efbe802ec6a2f3471bedd47 (diff) | |
| parent | 9be49a10699417aa5902144d99ff70e5e1fc6af8 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 5784af90834..c1dd4fcb4e4 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1503,7 +1503,8 @@ static void icon_draw_rect(float x, int draw_w = w; int draw_h = h; int draw_x = x; - int draw_y = y; + /* We need to round y, to avoid the icon jittering in some cases. */ + int draw_y = round_fl_to_int(y); /* sanity check */ if (w <= 0 || h <= 0 || w > 2000 || h > 2000) { diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 4b11ed61657..7d1b7b80ccd 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1407,8 +1407,8 @@ static void widget_draw_icon( /* force positions to integers, for zoom levels near 1. draws icons crisp. */ if (aspect > 0.95f && aspect < 1.05f) { - xs = (int)(xs + 0.1f); - ys = (int)(ys + 0.1f); + xs = roundf(xs); + ys = roundf(ys); } /* Get theme color. */ |