asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #61381 from ChronicallySerious/fix-commit-tab-move

Browse source
This commit is contained in:
Rémi Verschelde 2022-05-24 23:38:10 +02:00 committed by GitHub
commit 10eb8cac9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/plugins/version_control_editor_plugin.cpp
View file

@ -410,7 +410,10 @@ void VersionControlEditorPlugin::_refresh_stage_area() {
int total_changes = status_files.size();
String commit_tab_title = TTR("Commit") + (total_changes > 0 ? " (" + itos(total_changes) + ")" : "");
dock_vbc->set_tab_title(version_commit_dock->get_index(), commit_tab_title);
TabContainer *dock_vbc = Object::cast_to<TabContainer>(version_commit_dock->get_parent_control());
if (dock_vbc) {
dock_vbc->set_tab_title(version_commit_dock->get_index(), commit_tab_title);
}
}
void VersionControlEditorPlugin::_discard_file(String p_file_path, EditorVCSInterface::ChangeType p_change) {
@ -932,7 +935,7 @@ void VersionControlEditorPlugin::_commit_message_gui_input(const Ref<InputEvent>
void VersionControlEditorPlugin::register_editor() {
EditorNode::get_singleton()->add_control_to_dock(EditorNode::DOCK_SLOT_RIGHT_UL, version_commit_dock);
dock_vbc = (TabContainer *)version_commit_dock->get_parent_control();
TabContainer *dock_vbc = Object::cast_to<TabContainer>(version_commit_dock->get_parent_control());
dock_vbc->set_tab_title(version_commit_dock->get_index(), TTR("Commit"));
ToolButton *vc = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Version Control"), version_control_dock);

1
editor/plugins/version_control_editor_plugin.h
View file

@ -98,7 +98,6 @@ private:
HashMap<EditorVCSInterface::ChangeType, Color> change_type_to_color;
HashMap<EditorVCSInterface::ChangeType, Ref<Texture>> change_type_to_icon;
TabContainer *dock_vbc;
VBoxContainer *version_commit_dock;
Tree *staged_files;
Tree *unstaged_files;