Skip to content

Commit 41fc152

Browse files
committed
Merge pull request godotengine#90633 from YeldhamDev/the_popup_is_not_wearing_any_panels
Remove `Popup`'s unused "panel" style
2 parents 122054c + 7c75355 commit 41fc152

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

doc/classes/Popup.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,4 @@
2323
</description>
2424
</signal>
2525
</signals>
26-
<theme_items>
27-
<theme_item name="panel" data_type="style" type="StyleBox">
28-
Default [StyleBox] for the [Popup].
29-
</theme_item>
30-
</theme_items>
3126
</class>

doc/classes/PopupMenu.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,9 @@
768768
<theme_item name="labeled_separator_right" data_type="style" type="StyleBox">
769769
[StyleBox] for the right side of labeled separator. See [method add_separator].
770770
</theme_item>
771+
<theme_item name="panel" data_type="style" type="StyleBox">
772+
[StyleBox] for the the background panel.
773+
</theme_item>
771774
<theme_item name="separator" data_type="style" type="StyleBox">
772775
[StyleBox] used for the separators. See [method add_separator].
773776
</theme_item>

doc/classes/PopupPanel.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@
88
</description>
99
<tutorials>
1010
</tutorials>
11+
<theme_items>
12+
<theme_item name="panel" data_type="style" type="StyleBox">
13+
[StyleBox] for the the background panel.
14+
</theme_item>
15+
</theme_items>
1116
</class>

scene/gui/popup.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ Rect2i Popup::_popup_adjust_rect() const {
194194

195195
void Popup::_bind_methods() {
196196
ADD_SIGNAL(MethodInfo("popup_hide"));
197-
198-
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, Popup, panel_style, "panel");
199197
}
200198

201199
Popup::Popup() {

scene/gui/popup.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ class Popup : public Window {
4343
LocalVector<Window *> visible_parents;
4444
bool popped_up = false;
4545

46-
struct ThemeCache {
47-
Ref<StyleBox> panel_style;
48-
} theme_cache;
49-
5046
void _initialize_visible_parents();
5147
void _deinitialize_visible_parents();
5248

0 commit comments

Comments
 (0)