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

Minor cosmetic changes in some editor plugins

Browse source
This commit is contained in:
Michael Alexsander Silva Dias 2019-08-08 23:22:33 -03:00
parent fe3cd51755
commit eeb9268800
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/plugins/asset_library_editor_plugin.cpp
View file

@ -407,8 +407,6 @@ void EditorAssetLibraryItemDownload::configure(const String &p_title, int p_asse
icon->set_texture(get_icon("DefaultProjectIcon", "EditorIcons")); icon->set_texture(get_icon("DefaultProjectIcon", "EditorIcons"));
host = p_download_url; host = p_download_url;
sha256 = p_sha256_hash; sha256 = p_sha256_hash;
asset_installer->connect("confirmed", this, "_close");
dismiss->set_normal_texture(get_icon("Close", "EditorIcons"));
_make_request(); _make_request();
} }
@ -416,9 +414,11 @@ void EditorAssetLibraryItemDownload::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_READY: { // FIXME: The editor crashes if 'NOTICATION_THEME_CHANGED' is used.
case NOTIFICATION_ENTER_TREE: {
add_style_override("panel", get_stylebox("panel", "TabContainer")); add_style_override("panel", get_stylebox("panel", "TabContainer"));
dismiss->set_normal_texture(get_icon("Close", "EditorIcons"));
} break; } break;
case NOTIFICATION_PROCESS: { case NOTIFICATION_PROCESS: {
@ -571,6 +571,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() {
asset_installer = memnew(EditorAssetInstaller); asset_installer = memnew(EditorAssetInstaller);
add_child(asset_installer); add_child(asset_installer);
asset_installer->connect("confirmed", this, "_close");
prev_status = -1; prev_status = -1;

10
editor/plugins/script_editor_plugin.cpp
View file

@ -56,7 +56,7 @@ void ScriptEditorBase::_bind_methods() {
ADD_SIGNAL(MethodInfo("request_open_script_at_line", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::INT, "line"))); ADD_SIGNAL(MethodInfo("request_open_script_at_line", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::INT, "line")));
ADD_SIGNAL(MethodInfo("request_save_history")); ADD_SIGNAL(MethodInfo("request_save_history"));
ADD_SIGNAL(MethodInfo("go_to_help", PropertyInfo(Variant::STRING, "what"))); ADD_SIGNAL(MethodInfo("go_to_help", PropertyInfo(Variant::STRING, "what")));
// TODO This signal is no use for VisualScript... // TODO: This signal is no use for VisualScript.
ADD_SIGNAL(MethodInfo("search_in_files_requested", PropertyInfo(Variant::STRING, "text"))); ADD_SIGNAL(MethodInfo("search_in_files_requested", PropertyInfo(Variant::STRING, "text")));
} }
@ -205,11 +205,13 @@ void ScriptEditorQuickOpen::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
connect("confirmed", this, "_confirmed"); connect("confirmed", this, "_confirmed");
search_box->set_right_icon(get_icon("Search", "EditorIcons"));
search_box->set_clear_button_enabled(true); search_box->set_clear_button_enabled(true);
FALLTHROUGH;
}
case NOTIFICATION_THEME_CHANGED: {
search_box->set_right_icon(get_icon("Search", "EditorIcons"));
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
disconnect("confirmed", this, "_confirmed"); disconnect("confirmed", this, "_confirmed");
@ -242,6 +244,8 @@ ScriptEditorQuickOpen::ScriptEditorQuickOpen() {
set_hide_on_ok(false); set_hide_on_ok(false);
search_options->connect("item_activated", this, "_confirmed"); search_options->connect("item_activated", this, "_confirmed");
search_options->set_hide_root(true); search_options->set_hide_root(true);
search_options->set_hide_folding(true);
search_options->add_constant_override("draw_guides", 1);
} }
///////////////////////////////// /////////////////////////////////

10
editor/quick_open.cpp
View file

@ -256,16 +256,16 @@ void EditorQuickOpen::_confirmed() {
void EditorQuickOpen::_notification(int p_what) { void EditorQuickOpen::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
connect("confirmed", this, "_confirmed"); connect("confirmed", this, "_confirmed");
search_box->set_right_icon(get_icon("Search", "EditorIcons"));
search_box->set_clear_button_enabled(true); search_box->set_clear_button_enabled(true);
FALLTHROUGH;
}
case NOTIFICATION_THEME_CHANGED: {
search_box->set_right_icon(get_icon("Search", "EditorIcons"));
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
disconnect("confirmed", this, "_confirmed"); disconnect("confirmed", this, "_confirmed");
} break; } break;
} }
@ -289,7 +289,6 @@ EditorQuickOpen::EditorQuickOpen() {
VBoxContainer *vbc = memnew(VBoxContainer); VBoxContainer *vbc = memnew(VBoxContainer);
add_child(vbc); add_child(vbc);
//set_child_rect(vbc);
search_box = memnew(LineEdit); search_box = memnew(LineEdit);
vbc->add_margin_child(TTR("Search:"), search_box); vbc->add_margin_child(TTR("Search:"), search_box);
search_box->connect("text_changed", this, "_text_changed"); search_box->connect("text_changed", this, "_text_changed");
@ -302,6 +301,7 @@ EditorQuickOpen::EditorQuickOpen() {
set_hide_on_ok(false); set_hide_on_ok(false);
search_options->connect("item_activated", this, "_confirmed"); search_options->connect("item_activated", this, "_confirmed");
search_options->set_hide_root(true); search_options->set_hide_root(true);
search_options->set_hide_folding(true);
search_options->add_constant_override("draw_guides", 1); search_options->add_constant_override("draw_guides", 1);
ei = "EditorIcons"; ei = "EditorIcons";
ot = "Object"; ot = "Object";