mirror of
https://github.com/godotengine/godot.git
synced 2024-12-02 09:02:45 +00:00
Merge pull request #32638 from akien-mga/popupmenu-keep-name
PopupMenu: Fix inconsistency setting text/xl_text in add_* methods
This commit is contained in:
commit
76ef250d09
@ -89,6 +89,36 @@
|
|||||||
An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
|
An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
|
||||||
</description>
|
</description>
|
||||||
</method>
|
</method>
|
||||||
|
<method name="add_icon_radio_check_item">
|
||||||
|
<return type="void">
|
||||||
|
</return>
|
||||||
|
<argument index="0" name="texture" type="Texture">
|
||||||
|
</argument>
|
||||||
|
<argument index="1" name="label" type="String">
|
||||||
|
</argument>
|
||||||
|
<argument index="2" name="id" type="int" default="-1">
|
||||||
|
</argument>
|
||||||
|
<argument index="3" name="accel" type="int" default="0">
|
||||||
|
</argument>
|
||||||
|
<description>
|
||||||
|
Same as [method add_icon_check_item], but uses a radio check button.
|
||||||
|
</description>
|
||||||
|
</method>
|
||||||
|
<method name="add_icon_radio_check_shortcut">
|
||||||
|
<return type="void">
|
||||||
|
</return>
|
||||||
|
<argument index="0" name="texture" type="Texture">
|
||||||
|
</argument>
|
||||||
|
<argument index="1" name="shortcut" type="ShortCut">
|
||||||
|
</argument>
|
||||||
|
<argument index="2" name="id" type="int" default="-1">
|
||||||
|
</argument>
|
||||||
|
<argument index="3" name="global" type="bool" default="false">
|
||||||
|
</argument>
|
||||||
|
<description>
|
||||||
|
Same as [method add_icon_check_shortcut], but uses a radio check button.
|
||||||
|
</description>
|
||||||
|
</method>
|
||||||
<method name="add_icon_shortcut">
|
<method name="add_icon_shortcut">
|
||||||
<return type="void">
|
<return type="void">
|
||||||
</return>
|
</return>
|
||||||
@ -119,6 +149,25 @@
|
|||||||
An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
|
An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
|
||||||
</description>
|
</description>
|
||||||
</method>
|
</method>
|
||||||
|
<method name="add_multistate_item">
|
||||||
|
<return type="void">
|
||||||
|
</return>
|
||||||
|
<argument index="0" name="label" type="String">
|
||||||
|
</argument>
|
||||||
|
<argument index="1" name="max_states" type="int">
|
||||||
|
</argument>
|
||||||
|
<argument index="2" name="default_state" type="int">
|
||||||
|
</argument>
|
||||||
|
<argument index="3" name="id" type="int" default="-1">
|
||||||
|
</argument>
|
||||||
|
<argument index="4" name="accel" type="int" default="0">
|
||||||
|
</argument>
|
||||||
|
<description>
|
||||||
|
Adds a new multistate item with text [code]label[/code].
|
||||||
|
Contrarily to normal binary items, multistate items can have more than two states, as defined by [code]max_states[/code]. Each press or activate of the item will increase the state by one. The default value is defined by [code]default_state[/code].
|
||||||
|
An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
|
||||||
|
</description>
|
||||||
|
</method>
|
||||||
<method name="add_radio_check_item">
|
<method name="add_radio_check_item">
|
||||||
<return type="void">
|
<return type="void">
|
||||||
</return>
|
</return>
|
||||||
@ -129,7 +178,7 @@
|
|||||||
<argument index="2" name="accel" type="int" default="0">
|
<argument index="2" name="accel" type="int" default="0">
|
||||||
</argument>
|
</argument>
|
||||||
<description>
|
<description>
|
||||||
Adds a new radio button with text [code]label[/code].
|
Adds a new radio check button with text [code]label[/code].
|
||||||
An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
|
An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
|
||||||
[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method set_item_checked] for more info on how to control it.
|
[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method set_item_checked] for more info on how to control it.
|
||||||
</description>
|
</description>
|
||||||
|
@ -79,7 +79,7 @@ Size2 PopupMenu::get_minimum_size() const {
|
|||||||
if (items[i].checkable_type)
|
if (items[i].checkable_type)
|
||||||
has_check = true;
|
has_check = true;
|
||||||
|
|
||||||
String text = items[i].shortcut.is_valid() ? String(tr(items[i].shortcut->get_name())) : items[i].xl_text;
|
String text = items[i].xl_text;
|
||||||
size.width += font->get_string_size(text).width;
|
size.width += font->get_string_size(text).width;
|
||||||
if (i > 0)
|
if (i > 0)
|
||||||
size.height += vseparation;
|
size.height += vseparation;
|
||||||
@ -519,7 +519,7 @@ void PopupMenu::_notification(int p_what) {
|
|||||||
hover->draw(ci, Rect2(item_ofs + Point2(-hseparation, -vseparation / 2), Size2(get_size().width - style->get_minimum_size().width + hseparation * 2, h + vseparation)));
|
hover->draw(ci, Rect2(item_ofs + Point2(-hseparation, -vseparation / 2), Size2(get_size().width - style->get_minimum_size().width + hseparation * 2, h + vseparation)));
|
||||||
}
|
}
|
||||||
|
|
||||||
String text = items[i].shortcut.is_valid() ? String(tr(items[i].shortcut->get_name())) : items[i].xl_text;
|
String text = items[i].xl_text;
|
||||||
|
|
||||||
item_ofs.x += items[i].h_ofs;
|
item_ofs.x += items[i].h_ofs;
|
||||||
if (items[i].separator) {
|
if (items[i].separator) {
|
||||||
@ -627,25 +627,153 @@ void PopupMenu::_notification(int p_what) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PopupMenu::add_icon_item(const Ref<Texture> &p_icon, const String &p_label, int p_id, uint32_t p_accel) {
|
/* Methods to add items with or without icon, checkbox, shortcut.
|
||||||
|
* Be sure to keep them in sync when adding new properties in the Item struct.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel) \
|
||||||
|
item.text = p_label; \
|
||||||
|
item.xl_text = tr(p_label); \
|
||||||
|
item.id = p_id == -1 ? items.size() : p_id; \
|
||||||
|
item.accel = p_accel;
|
||||||
|
|
||||||
|
void PopupMenu::add_item(const String &p_label, int p_id, uint32_t p_accel) {
|
||||||
|
|
||||||
Item item;
|
Item item;
|
||||||
item.icon = p_icon;
|
ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel);
|
||||||
item.text = p_label;
|
|
||||||
item.xl_text = tr(p_label);
|
|
||||||
item.accel = p_accel;
|
|
||||||
item.id = p_id;
|
|
||||||
items.push_back(item);
|
items.push_back(item);
|
||||||
update();
|
update();
|
||||||
minimum_size_changed();
|
minimum_size_changed();
|
||||||
}
|
}
|
||||||
void PopupMenu::add_item(const String &p_label, int p_id, uint32_t p_accel) {
|
|
||||||
|
void PopupMenu::add_icon_item(const Ref<Texture> &p_icon, const String &p_label, int p_id, uint32_t p_accel) {
|
||||||
|
|
||||||
Item item;
|
Item item;
|
||||||
item.text = p_label;
|
ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel);
|
||||||
item.xl_text = tr(p_label);
|
item.icon = p_icon;
|
||||||
item.accel = p_accel;
|
items.push_back(item);
|
||||||
item.id = p_id == -1 ? items.size() : p_id;
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_check_item(const String &p_label, int p_id, uint32_t p_accel) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel);
|
||||||
|
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_icon_check_item(const Ref<Texture> &p_icon, const String &p_label, int p_id, uint32_t p_accel) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel);
|
||||||
|
item.icon = p_icon;
|
||||||
|
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_radio_check_item(const String &p_label, int p_id, uint32_t p_accel) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel);
|
||||||
|
item.checkable_type = Item::CHECKABLE_TYPE_RADIO_BUTTON;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_icon_radio_check_item(const Ref<Texture> &p_icon, const String &p_label, int p_id, uint32_t p_accel) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel);
|
||||||
|
item.icon = p_icon;
|
||||||
|
item.checkable_type = Item::CHECKABLE_TYPE_RADIO_BUTTON;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_multistate_item(const String &p_label, int p_max_states, int p_default_state, int p_id, uint32_t p_accel) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel);
|
||||||
|
item.max_states = p_max_states;
|
||||||
|
item.state = p_default_state;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
#define ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global) \
|
||||||
|
ERR_FAIL_COND_MSG(p_shortcut.is_null(), "Cannot add item with invalid ShortCut."); \
|
||||||
|
_ref_shortcut(p_shortcut); \
|
||||||
|
item.text = p_shortcut->get_name(); \
|
||||||
|
item.xl_text = tr(item.text); \
|
||||||
|
item.id = p_id == -1 ? items.size() : p_id; \
|
||||||
|
item.shortcut = p_shortcut; \
|
||||||
|
item.shortcut_is_global = p_global;
|
||||||
|
|
||||||
|
void PopupMenu::add_shortcut(const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global);
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_icon_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global);
|
||||||
|
item.icon = p_icon;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_check_shortcut(const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global);
|
||||||
|
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_icon_check_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global);
|
||||||
|
item.icon = p_icon;
|
||||||
|
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_radio_check_shortcut(const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global);
|
||||||
|
item.checkable_type = Item::CHECKABLE_TYPE_RADIO_BUTTON;
|
||||||
|
items.push_back(item);
|
||||||
|
update();
|
||||||
|
minimum_size_changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PopupMenu::add_icon_radio_check_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
||||||
|
|
||||||
|
Item item;
|
||||||
|
ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global);
|
||||||
|
item.icon = p_icon;
|
||||||
|
item.checkable_type = Item::CHECKABLE_TYPE_RADIO_BUTTON;
|
||||||
items.push_back(item);
|
items.push_back(item);
|
||||||
update();
|
update();
|
||||||
minimum_size_changed();
|
minimum_size_changed();
|
||||||
@ -656,141 +784,17 @@ void PopupMenu::add_submenu_item(const String &p_label, const String &p_submenu,
|
|||||||
Item item;
|
Item item;
|
||||||
item.text = p_label;
|
item.text = p_label;
|
||||||
item.xl_text = tr(p_label);
|
item.xl_text = tr(p_label);
|
||||||
item.id = p_id;
|
item.id = p_id == -1 ? items.size() : p_id;
|
||||||
item.submenu = p_submenu;
|
item.submenu = p_submenu;
|
||||||
items.push_back(item);
|
items.push_back(item);
|
||||||
update();
|
update();
|
||||||
minimum_size_changed();
|
minimum_size_changed();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PopupMenu::add_icon_check_item(const Ref<Texture> &p_icon, const String &p_label, int p_id, uint32_t p_accel) {
|
#undef ITEM_SETUP_WITH_ACCEL
|
||||||
|
#undef ITEM_SETUP_WITH_SHORTCUT
|
||||||
|
|
||||||
Item item;
|
/* Methods to modify existing items. */
|
||||||
item.icon = p_icon;
|
|
||||||
item.text = p_label;
|
|
||||||
item.xl_text = tr(p_label);
|
|
||||||
item.accel = p_accel;
|
|
||||||
item.id = p_id;
|
|
||||||
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
|
|
||||||
items.push_back(item);
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_check_item(const String &p_label, int p_id, uint32_t p_accel) {
|
|
||||||
|
|
||||||
Item item;
|
|
||||||
item.text = p_label;
|
|
||||||
item.xl_text = tr(p_label);
|
|
||||||
item.accel = p_accel;
|
|
||||||
item.id = p_id == -1 ? items.size() : p_id;
|
|
||||||
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
|
|
||||||
items.push_back(item);
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_radio_check_item(const String &p_label, int p_id, uint32_t p_accel) {
|
|
||||||
|
|
||||||
add_check_item(p_label, p_id, p_accel);
|
|
||||||
items.write[items.size() - 1].checkable_type = Item::CHECKABLE_TYPE_RADIO_BUTTON;
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_icon_radio_check_item(const Ref<Texture> &p_icon, const String &p_label, int p_id, uint32_t p_accel) {
|
|
||||||
|
|
||||||
add_icon_check_item(p_icon, p_label, p_id, p_accel);
|
|
||||||
items.write[items.size() - 1].checkable_type = Item::CHECKABLE_TYPE_RADIO_BUTTON;
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_icon_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
|
||||||
|
|
||||||
ERR_FAIL_COND(p_shortcut.is_null());
|
|
||||||
|
|
||||||
_ref_shortcut(p_shortcut);
|
|
||||||
|
|
||||||
Item item;
|
|
||||||
item.id = p_id;
|
|
||||||
item.icon = p_icon;
|
|
||||||
item.shortcut = p_shortcut;
|
|
||||||
item.shortcut_is_global = p_global;
|
|
||||||
items.push_back(item);
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_shortcut(const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
|
||||||
|
|
||||||
ERR_FAIL_COND(p_shortcut.is_null());
|
|
||||||
|
|
||||||
_ref_shortcut(p_shortcut);
|
|
||||||
|
|
||||||
Item item;
|
|
||||||
item.id = p_id;
|
|
||||||
item.shortcut = p_shortcut;
|
|
||||||
item.shortcut_is_global = p_global;
|
|
||||||
items.push_back(item);
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_icon_check_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
|
||||||
|
|
||||||
ERR_FAIL_COND(p_shortcut.is_null());
|
|
||||||
|
|
||||||
_ref_shortcut(p_shortcut);
|
|
||||||
|
|
||||||
Item item;
|
|
||||||
item.id = p_id;
|
|
||||||
item.shortcut = p_shortcut;
|
|
||||||
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
|
|
||||||
item.icon = p_icon;
|
|
||||||
item.shortcut_is_global = p_global;
|
|
||||||
items.push_back(item);
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_check_shortcut(const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
|
||||||
|
|
||||||
ERR_FAIL_COND(p_shortcut.is_null());
|
|
||||||
|
|
||||||
_ref_shortcut(p_shortcut);
|
|
||||||
|
|
||||||
Item item;
|
|
||||||
item.id = p_id;
|
|
||||||
item.shortcut = p_shortcut;
|
|
||||||
item.shortcut_is_global = p_global;
|
|
||||||
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
|
|
||||||
items.push_back(item);
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_radio_check_shortcut(const Ref<ShortCut> &p_shortcut, int p_id, bool p_global) {
|
|
||||||
|
|
||||||
add_check_shortcut(p_shortcut, p_id, p_global);
|
|
||||||
items.write[items.size() - 1].checkable_type = Item::CHECKABLE_TYPE_RADIO_BUTTON;
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::add_multistate_item(const String &p_label, int p_max_states, int p_default_state, int p_id, uint32_t p_accel) {
|
|
||||||
|
|
||||||
Item item;
|
|
||||||
item.text = p_label;
|
|
||||||
item.xl_text = tr(p_label);
|
|
||||||
item.accel = p_accel;
|
|
||||||
item.id = p_id;
|
|
||||||
item.max_states = p_max_states;
|
|
||||||
item.state = p_default_state;
|
|
||||||
items.push_back(item);
|
|
||||||
update();
|
|
||||||
minimum_size_changed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopupMenu::set_item_text(int p_idx, const String &p_text) {
|
void PopupMenu::set_item_text(int p_idx, const String &p_text) {
|
||||||
|
|
||||||
@ -1380,18 +1384,24 @@ void PopupMenu::clear_autohide_areas() {
|
|||||||
void PopupMenu::_bind_methods() {
|
void PopupMenu::_bind_methods() {
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("_gui_input"), &PopupMenu::_gui_input);
|
ClassDB::bind_method(D_METHOD("_gui_input"), &PopupMenu::_gui_input);
|
||||||
ClassDB::bind_method(D_METHOD("add_icon_item", "texture", "label", "id", "accel"), &PopupMenu::add_icon_item, DEFVAL(-1), DEFVAL(0));
|
|
||||||
ClassDB::bind_method(D_METHOD("add_item", "label", "id", "accel"), &PopupMenu::add_item, DEFVAL(-1), DEFVAL(0));
|
|
||||||
ClassDB::bind_method(D_METHOD("add_icon_check_item", "texture", "label", "id", "accel"), &PopupMenu::add_icon_check_item, DEFVAL(-1), DEFVAL(0));
|
|
||||||
ClassDB::bind_method(D_METHOD("add_check_item", "label", "id", "accel"), &PopupMenu::add_check_item, DEFVAL(-1), DEFVAL(0));
|
|
||||||
ClassDB::bind_method(D_METHOD("add_radio_check_item", "label", "id", "accel"), &PopupMenu::add_radio_check_item, DEFVAL(-1), DEFVAL(0));
|
|
||||||
ClassDB::bind_method(D_METHOD("add_submenu_item", "label", "submenu", "id"), &PopupMenu::add_submenu_item, DEFVAL(-1));
|
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("add_icon_shortcut", "texture", "shortcut", "id", "global"), &PopupMenu::add_icon_shortcut, DEFVAL(-1), DEFVAL(false));
|
ClassDB::bind_method(D_METHOD("add_item", "label", "id", "accel"), &PopupMenu::add_item, DEFVAL(-1), DEFVAL(0));
|
||||||
|
ClassDB::bind_method(D_METHOD("add_icon_item", "texture", "label", "id", "accel"), &PopupMenu::add_icon_item, DEFVAL(-1), DEFVAL(0));
|
||||||
|
ClassDB::bind_method(D_METHOD("add_check_item", "label", "id", "accel"), &PopupMenu::add_check_item, DEFVAL(-1), DEFVAL(0));
|
||||||
|
ClassDB::bind_method(D_METHOD("add_icon_check_item", "texture", "label", "id", "accel"), &PopupMenu::add_icon_check_item, DEFVAL(-1), DEFVAL(0));
|
||||||
|
ClassDB::bind_method(D_METHOD("add_radio_check_item", "label", "id", "accel"), &PopupMenu::add_radio_check_item, DEFVAL(-1), DEFVAL(0));
|
||||||
|
ClassDB::bind_method(D_METHOD("add_icon_radio_check_item", "texture", "label", "id", "accel"), &PopupMenu::add_icon_radio_check_item, DEFVAL(-1), DEFVAL(0));
|
||||||
|
|
||||||
|
ClassDB::bind_method(D_METHOD("add_multistate_item", "label", "max_states", "default_state", "id", "accel"), &PopupMenu::add_multistate_item, DEFVAL(0), DEFVAL(-1), DEFVAL(0));
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("add_shortcut", "shortcut", "id", "global"), &PopupMenu::add_shortcut, DEFVAL(-1), DEFVAL(false));
|
ClassDB::bind_method(D_METHOD("add_shortcut", "shortcut", "id", "global"), &PopupMenu::add_shortcut, DEFVAL(-1), DEFVAL(false));
|
||||||
ClassDB::bind_method(D_METHOD("add_icon_check_shortcut", "texture", "shortcut", "id", "global"), &PopupMenu::add_icon_check_shortcut, DEFVAL(-1), DEFVAL(false));
|
ClassDB::bind_method(D_METHOD("add_icon_shortcut", "texture", "shortcut", "id", "global"), &PopupMenu::add_icon_shortcut, DEFVAL(-1), DEFVAL(false));
|
||||||
ClassDB::bind_method(D_METHOD("add_check_shortcut", "shortcut", "id", "global"), &PopupMenu::add_check_shortcut, DEFVAL(-1), DEFVAL(false));
|
ClassDB::bind_method(D_METHOD("add_check_shortcut", "shortcut", "id", "global"), &PopupMenu::add_check_shortcut, DEFVAL(-1), DEFVAL(false));
|
||||||
|
ClassDB::bind_method(D_METHOD("add_icon_check_shortcut", "texture", "shortcut", "id", "global"), &PopupMenu::add_icon_check_shortcut, DEFVAL(-1), DEFVAL(false));
|
||||||
ClassDB::bind_method(D_METHOD("add_radio_check_shortcut", "shortcut", "id", "global"), &PopupMenu::add_radio_check_shortcut, DEFVAL(-1), DEFVAL(false));
|
ClassDB::bind_method(D_METHOD("add_radio_check_shortcut", "shortcut", "id", "global"), &PopupMenu::add_radio_check_shortcut, DEFVAL(-1), DEFVAL(false));
|
||||||
|
ClassDB::bind_method(D_METHOD("add_icon_radio_check_shortcut", "texture", "shortcut", "id", "global"), &PopupMenu::add_icon_radio_check_shortcut, DEFVAL(-1), DEFVAL(false));
|
||||||
|
|
||||||
|
ClassDB::bind_method(D_METHOD("add_submenu_item", "label", "submenu", "id"), &PopupMenu::add_submenu_item, DEFVAL(-1));
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("set_item_text", "idx", "text"), &PopupMenu::set_item_text);
|
ClassDB::bind_method(D_METHOD("set_item_text", "idx", "text"), &PopupMenu::set_item_text);
|
||||||
ClassDB::bind_method(D_METHOD("set_item_icon", "idx", "icon"), &PopupMenu::set_item_icon);
|
ClassDB::bind_method(D_METHOD("set_item_icon", "idx", "icon"), &PopupMenu::set_item_icon);
|
||||||
|
@ -120,21 +120,23 @@ protected:
|
|||||||
static void _bind_methods();
|
static void _bind_methods();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void add_icon_item(const Ref<Texture> &p_icon, const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
|
||||||
void add_item(const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
void add_item(const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
||||||
void add_icon_check_item(const Ref<Texture> &p_icon, const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
void add_icon_item(const Ref<Texture> &p_icon, const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
||||||
void add_check_item(const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
void add_check_item(const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
||||||
|
void add_icon_check_item(const Ref<Texture> &p_icon, const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
||||||
void add_radio_check_item(const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
void add_radio_check_item(const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
||||||
void add_icon_radio_check_item(const Ref<Texture> &p_icon, const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
void add_icon_radio_check_item(const Ref<Texture> &p_icon, const String &p_label, int p_id = -1, uint32_t p_accel = 0);
|
||||||
void add_submenu_item(const String &p_label, const String &p_submenu, int p_id = -1);
|
|
||||||
|
|
||||||
void add_icon_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
void add_multistate_item(const String &p_label, int p_max_states, int p_default_state = 0, int p_id = -1, uint32_t p_accel = 0);
|
||||||
|
|
||||||
void add_shortcut(const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
void add_shortcut(const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
||||||
void add_icon_check_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
void add_icon_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
||||||
void add_check_shortcut(const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
void add_check_shortcut(const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
||||||
|
void add_icon_check_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
||||||
void add_radio_check_shortcut(const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
void add_radio_check_shortcut(const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
||||||
|
void add_icon_radio_check_shortcut(const Ref<Texture> &p_icon, const Ref<ShortCut> &p_shortcut, int p_id = -1, bool p_global = false);
|
||||||
|
|
||||||
void add_multistate_item(const String &p_label, int p_max_states, int p_default_state, int p_id = -1, uint32_t p_accel = 0);
|
void add_submenu_item(const String &p_label, const String &p_submenu, int p_id = -1);
|
||||||
|
|
||||||
void set_item_text(int p_idx, const String &p_text);
|
void set_item_text(int p_idx, const String &p_text);
|
||||||
void set_item_icon(int p_idx, const Ref<Texture> &p_icon);
|
void set_item_icon(int p_idx, const Ref<Texture> &p_icon);
|
||||||
|
Loading…
Reference in New Issue
Block a user