maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #44724 from Chaosus/popup_separator

Browse source 
Added optional id parameter to `PopupMenu::add_separator`
This commit is contained in:
Rémi Verschelde 2020-12-29 17:39:44 +01:00 committed by GitHub
parent f62f64193a ca8c794d04
commit 3a9777cb3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/classes/PopupMenu.xml
View file

@ -205,8 +205,10 @@
</return>
<argument index="0" name="label" type="String" default="&quot;&quot;">
</argument>
<argument index="1" name="id" type="int" default="-1">
</argument>
<description>
Adds a separator between items. Separators also occupy an index.
Adds a separator between items. Separators also occupy an index, which you can set by using the [code]id[/code] parameter.
A [code]label[/code] can optionally be provided, which will appear at the center of the separator.
</description>
</method>

6
scene/gui/popup_menu.cpp
View file

@ -1349,10 +1349,10 @@ void PopupMenu::remove_item(int p_idx) {
child_controls_changed();
}
void PopupMenu::add_separator(const String &p_text) {
void PopupMenu::add_separator(const String &p_text, int p_id) {
Item sep;
sep.separator = true;
sep.id = -1;
sep.id = p_id;
if (p_text != String()) {
sep.text = p_text;
sep.xl_text = tr(p_text);
@ -1600,7 +1600,7 @@ void PopupMenu::_bind_methods() {
ClassDB::bind_method(D_METHOD("remove_item", "idx"), &PopupMenu::remove_item);
ClassDB::bind_method(D_METHOD("add_separator", "label"), &PopupMenu::add_separator, DEFVAL(String()));
ClassDB::bind_method(D_METHOD("add_separator", "label", "id"), &PopupMenu::add_separator, DEFVAL(String()), DEFVAL(-1));
ClassDB::bind_method(D_METHOD("clear"), &PopupMenu::clear);
ClassDB::bind_method(D_METHOD("_set_items"), &PopupMenu::_set_items);

2
scene/gui/popup_menu.h
View file

@ -228,7 +228,7 @@ public:
void remove_item(int p_idx);
void add_separator(const String &p_text = String());
void add_separator(const String &p_text = String(), int p_id = -1);
void clear();