Merge pull request #90633 from YeldhamDev/the_popup_is_not_wearing_an…

…y_panels Remove `Popup`'s unused "panel" style
godotengine · Apr 14, 2024 · 41fc152 · 41fc152
2 parents 122054c + 7c75355
commit 41fc152
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/doc/classes/Popup.xml b/doc/classes/Popup.xml
@@ -23,9 +23,4 @@
 			</description>
 		</signal>
 	</signals>
-	<theme_items>
-		<theme_item name="panel" data_type="style" type="StyleBox">
-			Default [StyleBox] for the [Popup].
-		</theme_item>
-	</theme_items>
 </class>
diff --git a/doc/classes/PopupMenu.xml b/doc/classes/PopupMenu.xml
@@ -768,6 +768,9 @@
 		<theme_item name="labeled_separator_right" data_type="style" type="StyleBox">
 			[StyleBox] for the right side of labeled separator. See [method add_separator].
 		</theme_item>
+		<theme_item name="panel" data_type="style" type="StyleBox">
+			[StyleBox] for the the background panel.
+		</theme_item>
 		<theme_item name="separator" data_type="style" type="StyleBox">
 			[StyleBox] used for the separators. See [method add_separator].
 		</theme_item>

diff --git a/doc/classes/PopupPanel.xml b/doc/classes/PopupPanel.xml
@@ -8,4 +8,9 @@
 	</description>
 	<tutorials>
 	</tutorials>
+	<theme_items>
+		<theme_item name="panel" data_type="style" type="StyleBox">
+			[StyleBox] for the the background panel.
+		</theme_item>
+	</theme_items>
 </class>
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
@@ -194,8 +194,6 @@ Rect2i Popup::_popup_adjust_rect() const {
 
 void Popup::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("popup_hide"));
-
-	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, Popup, panel_style, "panel");
 }
 
 Popup::Popup() {

diff --git a/scene/gui/popup.h b/scene/gui/popup.h
@@ -43,10 +43,6 @@ class Popup : public Window {
 	LocalVector<Window *> visible_parents;
 	bool popped_up = false;
 
-	struct ThemeCache {
-		Ref<StyleBox> panel_style;
-	} theme_cache;
-
 	void _initialize_visible_parents();
 	void _deinitialize_visible_parents();