From 7c75355541b726440916cb53da499cd4b1d43a17 Mon Sep 17 00:00:00 2001 From: Michael Alexsander Date: Sat, 13 Apr 2024 13:24:37 -0300 Subject: [PATCH] Remove `Popup`'s unused "panel" style --- doc/classes/Popup.xml | 5 ----- doc/classes/PopupMenu.xml | 3 +++ doc/classes/PopupPanel.xml | 5 +++++ scene/gui/popup.cpp | 2 -- scene/gui/popup.h | 4 ---- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/doc/classes/Popup.xml b/doc/classes/Popup.xml index c435f3d291a9..29b44a98f217 100644 --- a/doc/classes/Popup.xml +++ b/doc/classes/Popup.xml @@ -23,9 +23,4 @@ - - - Default [StyleBox] for the [Popup]. - - diff --git a/doc/classes/PopupMenu.xml b/doc/classes/PopupMenu.xml index 7831ebd1b914..0f5687f09180 100644 --- a/doc/classes/PopupMenu.xml +++ b/doc/classes/PopupMenu.xml @@ -768,6 +768,9 @@ [StyleBox] for the right side of labeled separator. See [method add_separator]. + + [StyleBox] for the the background panel. + [StyleBox] used for the separators. See [method add_separator]. diff --git a/doc/classes/PopupPanel.xml b/doc/classes/PopupPanel.xml index b86972e8af21..399e2854025f 100644 --- a/doc/classes/PopupPanel.xml +++ b/doc/classes/PopupPanel.xml @@ -8,4 +8,9 @@ + + + [StyleBox] for the the background panel. + + diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp index 092740494746..d90d5da2e981 100644 --- 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 index 25edca36577d..48818686f74f 100644 --- a/scene/gui/popup.h +++ b/scene/gui/popup.h @@ -43,10 +43,6 @@ class Popup : public Window { LocalVector visible_parents; bool popped_up = false; - struct ThemeCache { - Ref panel_style; - } theme_cache; - void _initialize_visible_parents(); void _deinitialize_visible_parents();