1 files changed, 52 insertions, 1 deletions

diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 3bcc60b86a..2200cac5da 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -289,7 +289,7 @@ void BaseButton::set_disabled(bool p_disabled) {
 	if (p_disabled)
 		set_focus_mode(FOCUS_NONE);
 	else
-		set_focus_mode(FOCUS_ALL);
+		set_focus_mode(enabled_focus_mode);
 }
 
 bool BaseButton::is_disabled() const {
@@ -377,12 +377,56 @@ bool BaseButton::get_click_on_press() const {
 	return status.click_on_press;
 }
 
+void BaseButton::set_enabled_focus_mode(FocusMode p_mode) {
 
+	enabled_focus_mode = p_mode;
+	if (!status.disabled) {
+		set_focus_mode( p_mode );
+	}
+}
+
+Control::FocusMode BaseButton::get_enabled_focus_mode() const {
+
+	return enabled_focus_mode;
+}
+
+void BaseButton::set_shortcut(const Ref<ShortCut>& p_shortcut) {
+
+	if (shortcut.is_null() == p_shortcut.is_null())
+		return;
+
+	shortcut=p_shortcut;
+	set_process_unhandled_input(shortcut.is_valid());
+}
 
+Ref<ShortCut> BaseButton:: get_shortcut() const {
+	return shortcut;
+}
+
+void BaseButton::_unhandled_input(InputEvent p_event) {
+
+	if (!is_disabled() && is_visible() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
+		if (is_toggle_mode()) {
+			set_pressed(!is_pressed());
+			emit_signal("toggled",is_pressed());
+		}
+
+		emit_signal("pressed");
+	}
+}
+
+String BaseButton::get_tooltip(const Point2& p_pos) const {
+
+	String tooltip=Control::get_tooltip(p_pos);
+	if (shortcut.is_valid() && shortcut->is_valid())
+		tooltip+=" ("+shortcut->get_as_text()+")";
+	return tooltip;
+}
 
 void BaseButton::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_input_event"),&BaseButton::_input_event);
+	ObjectTypeDB::bind_method(_MD("_unhandled_input"),&BaseButton::_unhandled_input);
 	ObjectTypeDB::bind_method(_MD("set_pressed","pressed"),&BaseButton::set_pressed);
 	ObjectTypeDB::bind_method(_MD("is_pressed"),&BaseButton::is_pressed);
 	ObjectTypeDB::bind_method(_MD("is_hovered"),&BaseButton::is_hovered);
@@ -393,6 +437,10 @@ void BaseButton::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_click_on_press","enable"),&BaseButton::set_click_on_press);
 	ObjectTypeDB::bind_method(_MD("get_click_on_press"),&BaseButton::get_click_on_press);
 	ObjectTypeDB::bind_method(_MD("get_draw_mode"),&BaseButton::get_draw_mode);
+	ObjectTypeDB::bind_method(_MD("set_enabled_focus_mode","mode"),&BaseButton::set_enabled_focus_mode);
+	ObjectTypeDB::bind_method(_MD("get_enabled_focus_mode"),&BaseButton::get_enabled_focus_mode);
+	ObjectTypeDB::bind_method(_MD("set_shortcut","shortcut"),&BaseButton::set_shortcut);
+	ObjectTypeDB::bind_method(_MD("get_shortcut"),&BaseButton::get_shortcut);
 
 	BIND_VMETHOD(MethodInfo("_pressed"));
 	BIND_VMETHOD(MethodInfo("_toggled",PropertyInfo(Variant::BOOL,"pressed")));
@@ -404,6 +452,8 @@ void BaseButton::_bind_methods() {
 	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"));
 
 
 	BIND_CONSTANT( DRAW_NORMAL );
@@ -424,6 +474,7 @@ BaseButton::BaseButton() {
 	status.click_on_press=false;
 	status.pressing_button=0;
 	set_focus_mode( FOCUS_ALL );
+	enabled_focus_mode = FOCUS_ALL;
 	group=NULL;