summaryrefslogtreecommitdiff
path: root/scene/gui/base_button.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/gui/base_button.cpp')
-rw-r--r--scene/gui/base_button.cpp78
1 files changed, 41 insertions, 37 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 45c491cd74..79b607e2e6 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -64,7 +64,7 @@ void BaseButton::_gui_input(InputEvent p_event) {
if (status.pressing_button)
break;
- if (status.click_on_press) {
+ if (action_mode==ACTION_MODE_BUTTON_PRESS) {
if (b.pressed) {
@@ -108,7 +108,7 @@ void BaseButton::_gui_input(InputEvent p_event) {
emit_signal("button_up");
/* this is pointless if (status.press_attempt && status.pressing_inside) {
-// released();
+ //released();
emit_signal("released");
}
*/
@@ -297,7 +297,7 @@ void BaseButton::_notification(int p_what) {
}
- if (p_what==NOTIFICATION_VISIBILITY_CHANGED && !is_visible()) {
+ if (p_what==NOTIFICATION_VISIBILITY_CHANGED && !is_visible_in_tree()) {
if (!toggle_mode) {
status.pressed = false;
@@ -415,14 +415,14 @@ bool BaseButton::is_toggle_mode() const {
return toggle_mode;
}
-void BaseButton::set_click_on_press(bool p_click_on_press) {
+void BaseButton::set_action_mode(ActionMode p_mode) {
- status.click_on_press=p_click_on_press;
+ action_mode=p_mode;
}
-bool BaseButton::get_click_on_press() const {
+BaseButton::ActionMode BaseButton::get_action_mode() const {
- return status.click_on_press;
+ return action_mode;
}
void BaseButton::set_enabled_focus_mode(FocusMode p_mode) {
@@ -453,7 +453,7 @@ Ref<ShortCut> BaseButton:: get_shortcut() const {
void BaseButton::_unhandled_input(InputEvent p_event) {
- if (!is_disabled() && is_visible() && p_event.is_pressed() && !p_event.is_echo() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
+ if (!is_disabled() && is_visible_in_tree() && p_event.is_pressed() && !p_event.is_echo() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
if (get_viewport()->get_modal_stack_top() && !get_viewport()->get_modal_stack_top()->is_a_parent_of(this))
return; //ignore because of modal window
@@ -505,26 +505,26 @@ Ref<ButtonGroup> BaseButton::get_button_group() const {
void BaseButton::_bind_methods() {
- ClassDB::bind_method(_MD("_gui_input"),&BaseButton::_gui_input);
- ClassDB::bind_method(_MD("_unhandled_input"),&BaseButton::_unhandled_input);
- ClassDB::bind_method(_MD("set_pressed","pressed"),&BaseButton::set_pressed);
- ClassDB::bind_method(_MD("is_pressed"),&BaseButton::is_pressed);
- ClassDB::bind_method(_MD("is_hovered"),&BaseButton::is_hovered);
- ClassDB::bind_method(_MD("set_toggle_mode","enabled"),&BaseButton::set_toggle_mode);
- ClassDB::bind_method(_MD("is_toggle_mode"),&BaseButton::is_toggle_mode);
- ClassDB::bind_method(_MD("set_disabled","disabled"),&BaseButton::set_disabled);
- ClassDB::bind_method(_MD("is_disabled"),&BaseButton::is_disabled);
- ClassDB::bind_method(_MD("set_click_on_press","enable"),&BaseButton::set_click_on_press);
- ClassDB::bind_method(_MD("get_click_on_press"),&BaseButton::get_click_on_press);
- ClassDB::bind_method(_MD("get_draw_mode"),&BaseButton::get_draw_mode);
- ClassDB::bind_method(_MD("set_enabled_focus_mode","mode"),&BaseButton::set_enabled_focus_mode);
- ClassDB::bind_method(_MD("get_enabled_focus_mode"),&BaseButton::get_enabled_focus_mode);
-
- ClassDB::bind_method(_MD("set_shortcut","shortcut"),&BaseButton::set_shortcut);
- ClassDB::bind_method(_MD("get_shortcut"),&BaseButton::get_shortcut);
-
- ClassDB::bind_method(_MD("set_button_group","button_group"),&BaseButton::set_button_group);
- ClassDB::bind_method(_MD("get_button_group"),&BaseButton::get_button_group);
+ ClassDB::bind_method(D_METHOD("_gui_input"),&BaseButton::_gui_input);
+ ClassDB::bind_method(D_METHOD("_unhandled_input"),&BaseButton::_unhandled_input);
+ ClassDB::bind_method(D_METHOD("set_pressed","pressed"),&BaseButton::set_pressed);
+ ClassDB::bind_method(D_METHOD("is_pressed"),&BaseButton::is_pressed);
+ ClassDB::bind_method(D_METHOD("is_hovered"),&BaseButton::is_hovered);
+ ClassDB::bind_method(D_METHOD("set_toggle_mode","enabled"),&BaseButton::set_toggle_mode);
+ ClassDB::bind_method(D_METHOD("is_toggle_mode"),&BaseButton::is_toggle_mode);
+ ClassDB::bind_method(D_METHOD("set_disabled","disabled"),&BaseButton::set_disabled);
+ ClassDB::bind_method(D_METHOD("is_disabled"),&BaseButton::is_disabled);
+ ClassDB::bind_method(D_METHOD("set_action_mode","mode"),&BaseButton::set_action_mode);
+ ClassDB::bind_method(D_METHOD("get_action_mode"),&BaseButton::get_action_mode);
+ ClassDB::bind_method(D_METHOD("get_draw_mode"),&BaseButton::get_draw_mode);
+ ClassDB::bind_method(D_METHOD("set_enabled_focus_mode","mode"),&BaseButton::set_enabled_focus_mode);
+ ClassDB::bind_method(D_METHOD("get_enabled_focus_mode"),&BaseButton::get_enabled_focus_mode);
+
+ ClassDB::bind_method(D_METHOD("set_shortcut","shortcut"),&BaseButton::set_shortcut);
+ ClassDB::bind_method(D_METHOD("get_shortcut"),&BaseButton::get_shortcut);
+
+ ClassDB::bind_method(D_METHOD("set_button_group","button_group"),&BaseButton::set_button_group);
+ ClassDB::bind_method(D_METHOD("get_button_group"),&BaseButton::get_button_group);
BIND_VMETHOD(MethodInfo("_pressed"));
BIND_VMETHOD(MethodInfo("_toggled",PropertyInfo(Variant::BOOL,"pressed")));
@@ -533,13 +533,13 @@ void BaseButton::_bind_methods() {
ADD_SIGNAL( MethodInfo("button_up") );
ADD_SIGNAL( MethodInfo("button_down") );
ADD_SIGNAL( MethodInfo("toggled", PropertyInfo( Variant::BOOL,"pressed") ) );
- ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "disabled"), _SCS("set_disabled"), _SCS("is_disabled"));
- ADD_PROPERTY( PropertyInfo( Variant::BOOL, "toggle_mode"), _SCS("set_toggle_mode"), _SCS("is_toggle_mode"));
- ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "is_pressed"), _SCS("set_pressed"), _SCS("is_pressed"));
- ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "click_on_press"), _SCS("set_click_on_press"), _SCS("get_click_on_press"));
- ADD_PROPERTY( PropertyInfo( Variant::INT,"enabled_focus_mode", PROPERTY_HINT_ENUM, "None,Click,All" ), _SCS("set_enabled_focus_mode"), _SCS("get_enabled_focus_mode") );
- ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "shortcut",PROPERTY_HINT_RESOURCE_TYPE,"ShortCut"), _SCS("set_shortcut"), _SCS("get_shortcut"));
- ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "group",PROPERTY_HINT_RESOURCE_TYPE,"ButtonGroup"), _SCS("set_button_group"), _SCS("get_button_group"));
+ ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "disabled"), "set_disabled", "is_disabled");
+ ADD_PROPERTY( PropertyInfo( Variant::BOOL, "toggle_mode"), "set_toggle_mode", "is_toggle_mode");
+ ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "is_pressed"), "set_pressed", "is_pressed");
+ ADD_PROPERTYNO( PropertyInfo( Variant::INT, "action_mode",PROPERTY_HINT_ENUM,"Button Press,Button Release"), "set_action_mode", "get_action_mode");
+ ADD_PROPERTY( PropertyInfo( Variant::INT,"enabled_focus_mode", PROPERTY_HINT_ENUM, "None,Click,All" ), "set_enabled_focus_mode", "get_enabled_focus_mode") ;
+ ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "shortcut",PROPERTY_HINT_RESOURCE_TYPE,"ShortCut"), "set_shortcut", "get_shortcut");
+ ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "group",PROPERTY_HINT_RESOURCE_TYPE,"ButtonGroup"), "set_button_group", "get_button_group");
BIND_CONSTANT( DRAW_NORMAL );
@@ -547,6 +547,10 @@ void BaseButton::_bind_methods() {
BIND_CONSTANT( DRAW_HOVER );
BIND_CONSTANT( DRAW_DISABLED );
+ BIND_CONSTANT( ACTION_MODE_BUTTON_PRESS );
+ BIND_CONSTANT( ACTION_MODE_BUTTON_RELEASE );
+
+
}
BaseButton::BaseButton() {
@@ -557,10 +561,10 @@ BaseButton::BaseButton() {
status.hovering=false;
status.pressing_inside=false;
status.disabled = false;
- status.click_on_press=false;
status.pressing_button=0;
set_focus_mode( FOCUS_ALL );
enabled_focus_mode = FOCUS_ALL;
+ action_mode=ACTION_MODE_BUTTON_RELEASE;
if (button_group.is_valid()) {
@@ -594,7 +598,7 @@ BaseButton* ButtonGroup::get_pressed_button() {
void ButtonGroup::_bind_methods() {
- ClassDB::bind_method(_MD("get_pressed_button:BaseButton"),&ButtonGroup::get_pressed_button);
+ ClassDB::bind_method(D_METHOD("get_pressed_button:BaseButton"),&ButtonGroup::get_pressed_button);
}
ButtonGroup::ButtonGroup() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 14:47:24 +0000