1 files changed, 32 insertions, 65 deletions

diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index b2020d44e8..2e77d20d4e 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -31,35 +31,36 @@
 #include "base_button.h"
 
 #include "core/os/keyboard.h"
-#include "scene/main/viewport.h"
+#include "scene/main/window.h"
 #include "scene/scene_string_names.h"
 
 void BaseButton::_unpress_group() {
-
-	if (!button_group.is_valid())
+	if (!button_group.is_valid()) {
 		return;
+	}
 
 	if (toggle_mode) {
 		status.pressed = true;
 	}
 
 	for (Set<BaseButton *>::Element *E = button_group->buttons.front(); E; E = E->next()) {
-		if (E->get() == this)
+		if (E->get() == this) {
 			continue;
+		}
 
 		E->get()->set_pressed(false);
 	}
 }
 
 void BaseButton::_gui_input(Ref<InputEvent> p_event) {
-
-	if (status.disabled) // no interaction with disabled button
+	if (status.disabled) { // no interaction with disabled button
 		return;
+	}
 
 	Ref<InputEventMouseButton> mouse_button = p_event;
 	bool ui_accept = p_event->is_action("ui_accept") && !p_event->is_echo();
 
-	bool button_masked = mouse_button.is_valid() && ((1 << (mouse_button->get_button_index() - 1)) & button_mask) > 0;
+	bool button_masked = mouse_button.is_valid() && ((1 << (mouse_button->get_button_index() - 1)) & button_mask) != 0;
 	if (button_masked || ui_accept) {
 		on_action_event(p_event);
 		return;
@@ -78,9 +79,7 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
 }
 
 void BaseButton::_notification(int p_what) {
-
 	if (p_what == NOTIFICATION_MOUSE_ENTER) {
-
 		status.hovering = true;
 		update();
 	}
@@ -90,7 +89,6 @@ void BaseButton::_notification(int p_what) {
 		update();
 	}
 	if (p_what == NOTIFICATION_DRAG_BEGIN || p_what == NOTIFICATION_SCROLL_BEGIN) {
-
 		if (status.press_attempt) {
 			status.press_attempt = false;
 			update();
@@ -98,13 +96,11 @@ void BaseButton::_notification(int p_what) {
 	}
 
 	if (p_what == NOTIFICATION_FOCUS_ENTER) {
-
 		status.hovering = true;
 		update();
 	}
 
 	if (p_what == NOTIFICATION_FOCUS_EXIT) {
-
 		if (status.press_attempt) {
 			status.press_attempt = false;
 			status.hovering = false;
@@ -116,7 +112,6 @@ void BaseButton::_notification(int p_what) {
 	}
 
 	if (p_what == NOTIFICATION_EXIT_TREE || (p_what == NOTIFICATION_VISIBILITY_CHANGED && !is_visible_in_tree())) {
-
 		if (!toggle_mode) {
 			status.pressed = false;
 		}
@@ -127,7 +122,6 @@ void BaseButton::_notification(int p_what) {
 }
 
 void BaseButton::_pressed() {
-
 	if (get_script_instance()) {
 		get_script_instance()->call(SceneStringNames::get_singleton()->_pressed);
 	}
@@ -136,7 +130,6 @@ void BaseButton::_pressed() {
 }
 
 void BaseButton::_toggled(bool p_pressed) {
-
 	if (get_script_instance()) {
 		get_script_instance()->call(SceneStringNames::get_singleton()->_toggled, p_pressed);
 	}
@@ -145,7 +138,6 @@ void BaseButton::_toggled(bool p_pressed) {
 }
 
 void BaseButton::on_action_event(Ref<InputEvent> p_event) {
-
 	if (p_event->is_pressed()) {
 		status.press_attempt = true;
 		status.pressing_inside = true;
@@ -194,8 +186,9 @@ void BaseButton::toggled(bool p_pressed) {
 }
 
 void BaseButton::set_disabled(bool p_disabled) {
-	if (status.disabled == p_disabled)
+	if (status.disabled == p_disabled) {
 		return;
+	}
 
 	status.disabled = p_disabled;
 	if (p_disabled) {
@@ -210,16 +203,16 @@ void BaseButton::set_disabled(bool p_disabled) {
 }
 
 bool BaseButton::is_disabled() const {
-
 	return status.disabled;
 }
 
 void BaseButton::set_pressed(bool p_pressed) {
-
-	if (!toggle_mode)
+	if (!toggle_mode) {
 		return;
-	if (status.pressed == p_pressed)
+	}
+	if (status.pressed == p_pressed) {
 		return;
+	}
 	_change_notify("pressed");
 	status.pressed = p_pressed;
 
@@ -232,29 +225,26 @@ void BaseButton::set_pressed(bool p_pressed) {
 }
 
 bool BaseButton::is_pressing() const {
-
 	return status.press_attempt;
 }
 
 bool BaseButton::is_pressed() const {
-
 	return toggle_mode ? status.pressed : status.press_attempt;
 }
 
 bool BaseButton::is_hovered() const {
-
 	return status.hovering;
 }
 
 BaseButton::DrawMode BaseButton::get_draw_mode() const {
-
 	if (status.disabled) {
 		return DRAW_DISABLED;
 	};
 
 	if (!status.press_attempt && status.hovering) {
-		if (status.pressed)
+		if (status.pressed) {
 			return DRAW_HOVER_PRESSED;
+		}
 
 		return DRAW_HOVER;
 	} else {
@@ -262,66 +252,62 @@ BaseButton::DrawMode BaseButton::get_draw_mode() const {
 
 		bool pressing;
 		if (status.press_attempt) {
-
 			pressing = (status.pressing_inside || keep_pressed_outside);
-			if (status.pressed)
+			if (status.pressed) {
 				pressing = !pressing;
+			}
 		} else {
-
 			pressing = status.pressed;
 		}
 
-		if (pressing)
+		if (pressing) {
 			return DRAW_PRESSED;
-		else
+		} else {
 			return DRAW_NORMAL;
+		}
 	}
 
 	return DRAW_NORMAL;
 }
 
 void BaseButton::set_toggle_mode(bool p_on) {
+	// Make sure to set 'pressed' to false if we are not in toggle mode
+	if (!p_on) {
+		set_pressed(false);
+	}
 
 	toggle_mode = p_on;
 }
 
 bool BaseButton::is_toggle_mode() const {
-
 	return toggle_mode;
 }
 
 void BaseButton::set_shortcut_in_tooltip(bool p_on) {
-
 	shortcut_in_tooltip = p_on;
 }
 
 bool BaseButton::is_shortcut_in_tooltip_enabled() const {
-
 	return shortcut_in_tooltip;
 }
 
 void BaseButton::set_action_mode(ActionMode p_mode) {
-
 	action_mode = p_mode;
 }
 
 BaseButton::ActionMode BaseButton::get_action_mode() const {
-
 	return action_mode;
 }
 
 void BaseButton::set_button_mask(int p_mask) {
-
 	button_mask = p_mask;
 }
 
 int BaseButton::get_button_mask() const {
-
 	return button_mask;
 }
 
 void BaseButton::set_enabled_focus_mode(FocusMode p_mode) {
-
 	enabled_focus_mode = p_mode;
 	if (!status.disabled) {
 		set_focus_mode(p_mode);
@@ -329,47 +315,37 @@ void BaseButton::set_enabled_focus_mode(FocusMode p_mode) {
 }
 
 Control::FocusMode BaseButton::get_enabled_focus_mode() const {
-
 	return enabled_focus_mode;
 }
 
 void BaseButton::set_keep_pressed_outside(bool p_on) {
-
 	keep_pressed_outside = p_on;
 }
 
 bool BaseButton::is_keep_pressed_outside() const {
-
 	return keep_pressed_outside;
 }
 
-void BaseButton::set_shortcut(const Ref<ShortCut> &p_shortcut) {
-
+void BaseButton::set_shortcut(const Ref<Shortcut> &p_shortcut) {
 	shortcut = p_shortcut;
 	set_process_unhandled_input(shortcut.is_valid());
 }
 
-Ref<ShortCut> BaseButton::get_shortcut() const {
+Ref<Shortcut> BaseButton::get_shortcut() const {
 	return shortcut;
 }
 
 void BaseButton::_unhandled_input(Ref<InputEvent> p_event) {
-
 	if (!is_disabled() && is_visible_in_tree() && !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
-
 		on_action_event(p_event);
 	}
 }
 
 String BaseButton::get_tooltip(const Point2 &p_pos) const {
-
 	String tooltip = Control::get_tooltip(p_pos);
 	if (shortcut_in_tooltip && shortcut.is_valid() && shortcut->is_valid()) {
 		String text = shortcut->get_name() + " (" + shortcut->get_as_text() + ")";
-		if (shortcut->get_name().nocasecmp_to(tooltip) != 0) {
+		if (tooltip != String() && shortcut->get_name().nocasecmp_to(tooltip) != 0) {
 			text += "\n" + tooltip;
 		}
 		tooltip = text;
@@ -378,7 +354,6 @@ String BaseButton::get_tooltip(const Point2 &p_pos) const {
 }
 
 void BaseButton::set_button_group(const Ref<ButtonGroup> &p_group) {
-
 	if (button_group.is_valid()) {
 		button_group->buttons.erase(this);
 	}
@@ -393,12 +368,10 @@ void BaseButton::set_button_group(const Ref<ButtonGroup> &p_group) {
 }
 
 Ref<ButtonGroup> BaseButton::get_button_group() const {
-
 	return button_group;
 }
 
 void BaseButton::_bind_methods() {
-
 	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);
@@ -441,7 +414,7 @@ void BaseButton::_bind_methods() {
 	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::INT, "enabled_focus_mode", PROPERTY_HINT_ENUM, "None,Click,All"), "set_enabled_focus_mode", "get_enabled_focus_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "keep_pressed_outside"), "set_keep_pressed_outside", "is_keep_pressed_outside");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut", PROPERTY_HINT_RESOURCE_TYPE, "ShortCut"), "set_shortcut", "get_shortcut");
+	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_ENUM_CONSTANT(DRAW_NORMAL);
@@ -455,7 +428,6 @@ void BaseButton::_bind_methods() {
 }
 
 BaseButton::BaseButton() {
-
 	toggle_mode = false;
 	shortcut_in_tooltip = true;
 	keep_pressed_outside = false;
@@ -471,21 +443,18 @@ BaseButton::BaseButton() {
 }
 
 BaseButton::~BaseButton() {
-
 	if (button_group.is_valid()) {
 		button_group->buttons.erase(this);
 	}
 }
 
 void ButtonGroup::get_buttons(List<BaseButton *> *r_buttons) {
-
 	for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
 		r_buttons->push_back(E->get());
 	}
 }
 
 Array ButtonGroup::_get_buttons() {
-
 	Array btns;
 	for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
 		btns.push_back(E->get());
@@ -495,22 +464,20 @@ Array ButtonGroup::_get_buttons() {
 }
 
 BaseButton *ButtonGroup::get_pressed_button() {
-
 	for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
-		if (E->get()->is_pressed())
+		if (E->get()->is_pressed()) {
 			return E->get();
+		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void ButtonGroup::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("get_pressed_button"), &ButtonGroup::get_pressed_button);
 	ClassDB::bind_method(D_METHOD("get_buttons"), &ButtonGroup::_get_buttons);
 }
 
 ButtonGroup::ButtonGroup() {
-
 	set_local_to_scene(true);
 }