blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 756 Projects 19 Wiki Activity

Fix #106775: File Draw Negative Width Buttons #106777

Merged
Harley Acheson merged 2 commits from Harley/blender:FileDrawAssert into main 2023-04-11 17:01:04 +02:00
Conversation 0 Commits 2 Files Changed 1 +18 -16
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/editors/space_file/file_draw.cc
View File

@ -1033,22 +1033,24 @@ void file_draw_list(const bContext *C, ARegion *region)
const uiStyle *style = UI_style_get(); const uiStyle *style = UI_style_get();
const int str_width = UI_fontstyle_string_width(&style->widget, file->name); const int str_width = UI_fontstyle_string_width(&style->widget, file->name);
const int drag_width = MIN2(str_width + icon_ofs, column_width - ATTRIBUTE_COLUMN_PADDING); const int drag_width = MIN2(str_width + icon_ofs, column_width - ATTRIBUTE_COLUMN_PADDING);
uiBut *drag_but = uiDefBut(block, if (drag_width > 0) {
UI_BTYPE_LABEL, uiBut *drag_but = uiDefBut(block,
0, UI_BTYPE_LABEL,
"", 0,
tile_draw_rect.xmin, "",
tile_draw_rect.ymin - 1, tile_draw_rect.xmin,
drag_width, tile_draw_rect.ymin - 1,
layout->tile_h + layout->tile_border_y * 2, drag_width,
nullptr, layout->tile_h + layout->tile_border_y * 2,
0, nullptr,
0, 0,
0, 0,
0, 0,
0); 0,
UI_but_dragflag_enable(drag_but, UI_BUT_DRAG_FULL_BUT); 0);
file_but_enable_drag(drag_but, sfile, file, path, nullptr, icon, UI_SCALE_FAC); UI_but_dragflag_enable(drag_but, UI_BUT_DRAG_FULL_BUT);
file_but_enable_drag(drag_but, sfile, file, path, nullptr, icon, UI_SCALE_FAC);
}
} }
/* Add this after the fake draggable button, so the icon button tooltip is displayed. */ /* Add this after the fake draggable button, so the icon button tooltip is displayed. */