godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #112176 from dugramen/stretch-inline-container

Browse Source 
Stretch inline buttons & center text to full property header height
This commit is contained in:
Rémi Verschelde
2025-10-29 23:55:50 +01:00
committed by GitHub
parent 534591047e d795a3b536
commit 07f4c06601
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/inspector/editor_inspector.cpp
View File

@@ -436,6 +436,7 @@ void EditorProperty::_notification(int p_what) {
} }
Size2 rs = right_container->get_combined_minimum_size(); Size2 rs = right_container->get_combined_minimum_size();
rs.y = MAX(rs.y, rect.size.y);
if (is_layout_rtl()) { if (is_layout_rtl()) {
fit_child_in_rect(right_container, Rect2(0, 0, rs.width, rs.y)); fit_child_in_rect(right_container, Rect2(0, 0, rs.width, rs.y));
} else { } else {
@@ -444,6 +445,7 @@ void EditorProperty::_notification(int p_what) {
Size2 ls = left_container->get_combined_minimum_size(); Size2 ls = left_container->get_combined_minimum_size();
real_t right_size = rect.size.x + rs.x; real_t right_size = rect.size.x + rs.x;
ls.y = MAX(ls.y, rect.size.y);
if (is_layout_rtl()) { if (is_layout_rtl()) {
fit_child_in_rect(left_container, Rect2(right_size, 0, size.x - right_size, ls.y)); fit_child_in_rect(left_container, Rect2(right_size, 0, size.x - right_size, ls.y));
} else { } else {
@@ -463,9 +465,8 @@ void EditorProperty::_notification(int p_what) {
size.height = bottom_editor->get_offset(SIDE_TOP) - _get_v_separation(); size.height = bottom_editor->get_offset(SIDE_TOP) - _get_v_separation();
} else if (label_reference) { } else if (label_reference) {
size.height = label_reference->get_size().height; size.height = label_reference->get_size().height;
} else if (label_overlayed) {
size.height = left_container->get_size().height;
} }
size.height = MAX(size.height, left_container->get_size().height);
// Only draw the label if it's not empty. // Only draw the label if it's not empty.
if (label.is_empty()) { if (label.is_empty()) {