Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix View3D 'Auto Keying' alignment (when dpi!=72)

Browse Source
This commit is contained in:
Campbell Barton
2014-09-04 15:56:40 +10:00
parent 4987eb4dc9
commit bbf2db82a2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/transform/transform.c
View File

@@ -1838,24 +1838,26 @@ static void drawAutoKeyWarning(TransInfo *UNUSED(t), ARegion *ar)
BLF_width_and_height_default(printable, BLF_DRAW_STR_DUMMY_MAX, &printable_size[0], &printable_size[1]); BLF_width_and_height_default(printable, BLF_DRAW_STR_DUMMY_MAX, &printable_size[0], &printable_size[1]);
xco = rect.xmax - (int)printable_size[0] - 10; xco = (rect.xmax - U.widget_unit) - (int)printable_size[0];
yco = rect.ymax - (int)printable_size[1] - 10; yco = (rect.ymax - U.widget_unit);
/* warning text (to clarify meaning of overlays) /* warning text (to clarify meaning of overlays)
* - original color was red to match the icon, but that clashes badly with a less nasty border * - original color was red to match the icon, but that clashes badly with a less nasty border
*/ */
UI_ThemeColorShade(TH_TEXT_HI, -50); UI_ThemeColorShade(TH_TEXT_HI, -50);
#ifdef WITH_INTERNATIONAL #ifdef WITH_INTERNATIONAL
BLF_draw_default(xco, ar->winy - 17, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX); BLF_draw_default(xco, yco, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
#else #else
BLF_draw_default_ascii(xco, ar->winy - 17, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX); BLF_draw_default_ascii(xco, yco, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
#endif #endif
/* autokey recording icon... */ /* autokey recording icon... */
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND); glEnable(GL_BLEND);
xco -= (ICON_DEFAULT_WIDTH + 2); xco -= U.widget_unit;
yco -= (int)printable_size[1] / 2;
UI_icon_draw(xco, yco, ICON_REC); UI_icon_draw(xco, yco, ICON_REC);
glDisable(GL_BLEND); glDisable(GL_BLEND);