godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-04 19:21:46 +00:00
Code Releases Wiki Activity

Merge pull request #31335 from Xenoamor/bugfix/GridMapListTextCutoff

Browse Source 
Fix GridMap list text not expanding when palette is resized
This commit is contained in:
Rémi Verschelde
2019-08-13 08:32:48 +02:00
committed by GitHub
parent 57270dd943 69438149f5
commit 4403744ef9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gridmap/grid_map_editor_plugin.cpp
View File

@@ -863,19 +863,21 @@ void GridMapEditor::_icon_size_changed(float p_value) {
void GridMapEditor::update_palette() {
int selected = mesh_library_palette->get_current();
float min_size = EDITOR_DEF("editors/grid_map/preview_size", 64);
min_size *= EDSCALE;
mesh_library_palette->clear();
if (display_mode == DISPLAY_THUMBNAIL) {
mesh_library_palette->set_max_columns(0);
mesh_library_palette->set_icon_mode(ItemList::ICON_MODE_TOP);
mesh_library_palette->set_fixed_column_width(min_size * MAX(size_slider->get_value(), 1.5));
} else if (display_mode == DISPLAY_LIST) {
mesh_library_palette->set_max_columns(1);
mesh_library_palette->set_icon_mode(ItemList::ICON_MODE_LEFT);
mesh_library_palette->set_fixed_column_width(0);
}
float min_size = EDITOR_DEF("editors/grid_map/preview_size", 64);
min_size *= EDSCALE;
mesh_library_palette->set_fixed_icon_size(Size2(min_size, min_size));
mesh_library_palette->set_fixed_column_width(min_size * MAX(size_slider->get_value(), 1.5));
mesh_library_palette->set_max_text_lines(2);
Ref<MeshLibrary> mesh_library = node->get_mesh_library();