From 09e5aa5156486585b3d23f52f927db744fb9a055 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 15 Apr 2014 16:49:49 +0200 Subject: Fix T39234: popup menus behave poorly when they have not enough width for all their columns. Issue fixed by: * Not having constant width for all columns, but adapt each to its content's width; * Adapting undo's menu height to undo list length (so that we never have more than three columns). It is still possible to get issues in extreme cases (small screen, high DPI size, long op names everywhere...), but this should now be rare corner cases. Also fixes a minor glitch with undo menu (first column had one item less than the others...). --- source/blender/editors/interface/interface.c | 52 +++++++++++++--------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'source/blender/editors/interface/interface.c') diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 7e6e00bbdff..56222889cf2 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -207,43 +207,41 @@ void ui_block_translate(uiBlock *block, int x, int y) static void ui_text_bounds_block(uiBlock *block, float offset) { uiStyle *style = UI_GetStyle(); - uiBut *bt; - int i = 0, j, x1addval = offset, nextcol; - int lastcol = 0, col = 0; - + uiBut *bt, *init_col_bt, *col_bt; + int i = 0, j, x1addval = offset; + uiStyleFontSet(&style->widget); - - for (bt = block->buttons.first; bt; bt = bt->next) { + + for (init_col_bt = bt = block->buttons.first; bt; bt = bt->next) { if (!ELEM(bt->type, SEPR, SEPRLINE)) { j = BLF_width(style->widget.uifont_id, bt->drawstr, sizeof(bt->drawstr)); - if (j > i) i = j; + if (j > i) + i = j; } - if (bt->next && bt->rect.xmin < bt->next->rect.xmin) - lastcol++; - } + if (bt->next && bt->rect.xmin < bt->next->rect.xmin) { + /* End of this column, and it’s not the last one. */ + for (col_bt = init_col_bt; col_bt->prev != bt; col_bt = col_bt->next) { + col_bt->rect.xmin = x1addval; + col_bt->rect.xmax = x1addval + i + block->bounds; - /* cope with multi collumns */ - bt = block->buttons.first; - while (bt) { - nextcol = (bt->next && bt->rect.xmin < bt->next->rect.xmin); - - bt->rect.xmin = x1addval; - bt->rect.xmax = bt->rect.xmin + i + block->bounds; - - if (col == lastcol) { - bt->rect.xmax = max_ff(bt->rect.xmax, offset + block->minbounds); - } + ui_check_but(col_bt); /* clips text again */ + } - ui_check_but(bt); /* clips text again */ - - if (nextcol) { + /* And we prepare next column. */ x1addval += i + block->bounds; - col++; + i = 0; + init_col_bt = col_bt; } - - bt = bt->next; + } + + /* Last column. */ + for (col_bt = init_col_bt; col_bt; col_bt = col_bt->next) { + col_bt->rect.xmin = x1addval; + col_bt->rect.xmax = max_ff(x1addval + i + block->bounds, offset + block->minbounds); + + ui_check_but(col_bt); /* clips text again */ } } -- cgit v1.2.3