diff options
author | Ton Roosendaal <ton@blender.org> | 2013-04-18 12:51:07 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-04-18 12:51:07 +0400 |
commit | 093f95afaa4a08d2cf194b88803a35ef16cfec58 (patch) | |
tree | 40d7dcdcc13f5c64fa479015238700c3aa40baca /source/blender/editors/interface | |
parent | 8a06acfd7af8800f274e1c4712de1d129ef63e58 (diff) |
Bug fix #34868
Pulldown menus with long shortcut text labels got clipped badly occasionally.
Made the offset follow DPI better.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_style.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index dd4886a7243..63577740c01 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -162,7 +162,7 @@ void uiStyleFontDrawExt(uiFontStyle *fs, const rcti *rect, const char *str, } } else if (fs->align == UI_STYLE_TEXT_RIGHT) { - xofs = BLI_rcti_size_x(rect) - BLF_width(fs->uifont_id, str) - 1; + xofs = BLI_rcti_size_x(rect) - BLF_width(fs->uifont_id, str) - 0.1f * U.widget_unit; } /* clip is very strict, so we give it some space */ diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 905c914352f..37a31a7670d 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1265,7 +1265,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b /* part text right aligned */ if (cpoin) { fstyle->align = UI_STYLE_TEXT_RIGHT; - rect->xmax -= ui_but_draw_menu_icon(but) ? UI_DPI_ICON_SIZE : 5; + rect->xmax -= ui_but_draw_menu_icon(but) ? UI_DPI_ICON_SIZE : 0.25f * U.widget_unit; uiStyleFontDraw(fstyle, rect, cpoin + 1); *cpoin = '|'; } |