Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.x] VCS: Allow to stage and commit all files with Ctrl + Enter #50432

Merged
merged 1 commit into from
Aug 2, 2021
Merged

[3.x] VCS: Allow to stage and commit all files with Ctrl + Enter #50432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions editor/plugins/version_control_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#include "version_control_editor_plugin.h"

#include "core/os/keyboard.h"
#include "core/script_language.h"
#include "editor/editor_file_system.h"
#include "editor/editor_node.h"
Expand All @@ -47,6 +48,7 @@ void VersionControlEditorPlugin::_bind_methods() {
ClassDB::bind_method(D_METHOD("_view_file_diff"), &VersionControlEditorPlugin::_view_file_diff);
ClassDB::bind_method(D_METHOD("_refresh_file_diff"), &VersionControlEditorPlugin::_refresh_file_diff);
ClassDB::bind_method(D_METHOD("_update_commit_button"), &VersionControlEditorPlugin::_update_commit_button);
ClassDB::bind_method(D_METHOD("_commit_message_gui_input"), &VersionControlEditorPlugin::_commit_message_gui_input);
ClassDB::bind_method(D_METHOD("popup_vcs_set_up_dialog"), &VersionControlEditorPlugin::popup_vcs_set_up_dialog);

// Used to track the status of files in the staging area
Expand Down Expand Up @@ -301,6 +303,29 @@ void VersionControlEditorPlugin::_update_commit_button() {
commit_button->set_disabled(commit_message->get_text().strip_edges() == "");
}

void VersionControlEditorPlugin::_commit_message_gui_input(const Ref<InputEvent> &p_event) {
if (!commit_message->has_focus()) {
return;
}
if (commit_message->get_text().strip_edges().empty()) {
// Do not allow empty commit messages.
return;
}
const Ref<InputEventKey> k = p_event;

if (k.is_valid() && k->is_pressed()) {
if (ED_IS_SHORTCUT("version_control/commit", p_event)) {
if (staged_files_count == 0) {
// Stage all files only when no files were previously staged.
_stage_all();
}
_send_commit_msg();
commit_message->accept_event();
return;
}
}
}

void VersionControlEditorPlugin::register_editor() {
if (!EditorVCSInterface::get_singleton()) {
EditorNode::get_singleton()->add_control_to_dock(EditorNode::DOCK_SLOT_RIGHT_UL, version_commit_dock);
Expand Down Expand Up @@ -475,7 +500,9 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
commit_message->set_custom_minimum_size(Size2(200, 100));
commit_message->set_wrap_enabled(true);
commit_message->connect("text_changed", this, "_update_commit_button");
commit_message->connect("gui_input", this, "_commit_message_gui_input");
commit_box_vbc->add_child(commit_message);
ED_SHORTCUT("version_control/commit", TTR("Commit"), KEY_MASK_CMD | KEY_ENTER);

commit_button = memnew(Button);
commit_button->set_text(TTR("Commit Changes"));
Expand Down
1 change: 1 addition & 0 deletions editor/plugins/version_control_editor_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class VersionControlEditorPlugin : public EditorPlugin {
void _update_stage_status();
void _update_commit_status();
void _update_commit_button();
void _commit_message_gui_input(const Ref<InputEvent> &p_event);

friend class EditorVCSInterface;

Expand Down