diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-23 23:16:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 23:16:52 +0100 |
| commit | 31a7ddbf838572e50415159a56720275f9523262 (patch) | |
| tree | a28d864a1a12de9ba831a9d03d85406fb008526b /scene/gui | |
| parent | 81c28dd706913e66288e847772d5ea0e64e7c80c (diff) | |
| parent | bd4d57ede2c12e52ff0662d00bf0413006fc2260 (diff) | |
Merge pull request #57101 from akien-mga/basebutton-pressed-conflict
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/base_button.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index eee7663b09..bcb2b0c50e 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -444,7 +444,7 @@ void BaseButton::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "is_disabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toggle_mode"), "set_toggle_mode", "is_toggle_mode"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shortcut_in_tooltip"), "set_shortcut_in_tooltip", "is_shortcut_in_tooltip_enabled"); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "pressed"), "set_pressed", "is_pressed"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "button_pressed"), "set_pressed", "is_pressed"); ADD_PROPERTY(PropertyInfo(Variant::INT, "action_mode", PROPERTY_HINT_ENUM, "Button Press,Button Release"), "set_action_mode", "get_action_mode"); ADD_PROPERTY(PropertyInfo(Variant::INT, "button_mask", PROPERTY_HINT_FLAGS, "Mouse Left, Mouse Right, Mouse Middle"), "set_button_mask", "get_button_mask"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "keep_pressed_outside"), "set_keep_pressed_outside", "is_keep_pressed_outside"); |