Merge pull request #41640 from EricEzaM/PR/popup-menu-rework-scroll-c…

…ontainer PopupMenu rework and enhancements.
godotengine · Sep 1, 2020 · 0afabf6 · 0afabf6
2 parents ac30466 + 73c7fb2
commit 0afabf6
Show file tree

Hide file tree

Showing 3 changed files with 238 additions and 169 deletions.
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
@@ -126,6 +126,28 @@ Rect2i Popup::_popup_adjust_rect() const {
 		current.position.y = parent.position.y;
 	}
 
+	if (current.size.y > parent.size.y) {
+		current.size.y = parent.size.y;
+	}
+
+	if (current.size.x > parent.size.x) {
+		current.size.x = parent.size.x;
+	}
+
+	// Early out if max size not set.
+	Size2i max_size = get_max_size();
+	if (max_size <= Size2()) {
+		return current;
+	}
+
+	if (current.size.x > max_size.x) {
+		current.size.x = max_size.x;
+	}
+
+	if (current.size.y > max_size.y) {
+		current.size.y = max_size.y;
+	}
+
 	return current;
 }