Explorar o código

Remove `Popup`'s unused "panel" style

Michael Alexsander hai 1 ano
pai
achega
7c75355541
Modificáronse 5 ficheiros con 8 adicións e 11 borrados
  1. 0 5
      doc/classes/Popup.xml
  2. 3 0
      doc/classes/PopupMenu.xml
  3. 5 0
      doc/classes/PopupPanel.xml
  4. 0 2
      scene/gui/popup.cpp
  5. 0 4
      scene/gui/popup.h

+ 0 - 5
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>

+ 3 - 0
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>

+ 5 - 0
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>

+ 0 - 2
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() {

+ 0 - 4
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();