summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-06-15 18:29:17 +0200
committerGitHub <noreply@github.com>2016-06-15 18:29:17 +0200
commit367aabf03080da8e4e72c9db56b0b2097c86d6b4 (patch)
treeeac4266806d8d8b6eee88f36190c9b4e9696913a
parent1899f7f28d814193a04b50fe51c5494f0eb14813 (diff)
parent3e50ec71e97dbad6978f06261175a4c0504013d8 (diff)
Merge pull request #5230 from Paulb23/fullscreen_distraction_mode_shortcuts
Added fullscreen and distraction free mode shortcuts
-rw-r--r--tools/editor/editor_node.cpp27
1 files changed, 15 insertions, 12 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 2e8bf0f311..1132db5991 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -171,6 +171,19 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
if (p_event.type==InputEvent::KEY && p_event.key.pressed && !p_event.key.echo && !gui_base->get_viewport()->gui_has_modal_stack()) {
+
+ if (ED_IS_SHORTCUT("editor/fullscreen_mode", p_event)) {
+ if (distraction_free_mode) {
+ distraction_free_mode = false;
+ _update_top_menu_visibility();
+ } else {
+ set_docks_visible(!get_docks_visible());
+ }
+ }
+ if (ED_IS_SHORTCUT("editor/distraction_free_mode", p_event)) {
+ set_distraction_free_mode(!get_distraction_free_mode());
+ }
+
switch(p_event.key.scancode) {
/*case KEY_F1:
@@ -193,18 +206,6 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break;
//case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break;
case KEY_F8: _menu_option_confirm(RUN_STOP,true); break;*/
- case KEY_F11: {
- if (p_event.key.mod.shift) {
- if (p_event.key.mod.control) {
- set_distraction_free_mode(!get_distraction_free_mode());
- } else if (distraction_free_mode) {
- distraction_free_mode = false;
- _update_top_menu_visibility();
- } else {
- set_docks_visible(!get_docks_visible());
- }
- }
- } break;
}
}
@@ -5604,6 +5605,8 @@ EditorNode::EditorNode() {
prev_scene->set_pos(Point2(3,24));
prev_scene->hide();
+ ED_SHORTCUT("editor/fullscreen_mode",TTR("Fullscreen Mode"),KEY_MASK_SHIFT|KEY_F11);
+ ED_SHORTCUT("editor/distraction_free_mode",TTR("Distraction Free Mode"),KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_F11);
Separator *vs=NULL;