Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-01-25 14:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle horizontal minimum in the flex grid container.

Browse Source
This commit is contained in:
Relintai 2021-12-28 21:12:42 +01:00
parent b0613182d0
commit 290f8e39f1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/addons/mesh_data_resource_editor/widgets/flex_grid_container.gd
View File

@ -27,7 +27,7 @@ extends Container
var columns: int = 1 setget set_columns var columns: int = 1 setget set_columns
var _min_x : int = 0
func _notification(p_what): func _notification(p_what):
match p_what: match p_what:
@ -41,6 +41,7 @@ func _notification(p_what):
var vsep = get_constant("vseparation", "GridContainer") var vsep = get_constant("vseparation", "GridContainer")
var min_columns = 1 var min_columns = 1
_min_x = 0
if get_child_count() > 0: if get_child_count() > 0:
min_columns = int(floor(rect_size.x / (get_child(0).get_combined_minimum_size().x + hsep))) min_columns = int(floor(rect_size.x / (get_child(0).get_combined_minimum_size().x + hsep)))
@ -62,6 +63,10 @@ func _notification(p_what):
valid_controls_index += 1 valid_controls_index += 1
var ms: Vector2 = c.get_combined_minimum_size() var ms: Vector2 = c.get_combined_minimum_size()
if _min_x < ms.x:
_min_x = ms.x
if col_minw.has(col): if col_minw.has(col):
col_minw[col] = max(col_minw[col], ms.x) col_minw[col] = max(col_minw[col], ms.x)
else: else:
@ -187,6 +192,7 @@ func _get_minimum_size():
max_row = max(row, max_row) max_row = max(row, max_row)
var ms: Vector2 var ms: Vector2
ms.x = _min_x
for e in row_minh.keys(): for e in row_minh.keys():
ms.y += row_minh.get(e) ms.y += row_minh.get(e)