From f4a62f227ffb350f1ba44cb5547e2b04225d3a14 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Sat, 21 Dec 2019 05:03:57 +0200 Subject: [PATCH] Changed transparent background and default clear color for Godot's theme --- Assets/Graphics/Transparent Background Godot.png | Bin 84 -> 84 bytes Assets/Graphics/Transparent Background Gray.png | Bin 0 -> 84 bytes .../Transparent Background Gray.png.import | 13 +++++++++++++ Main.tscn | 3 +++ Scripts/Global.gd | 2 +- Scripts/PreferencesDialog.gd | 4 ++-- 6 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 Assets/Graphics/Transparent Background Gray.png create mode 100644 Assets/Graphics/Transparent Background Gray.png.import diff --git a/Assets/Graphics/Transparent Background Godot.png b/Assets/Graphics/Transparent Background Godot.png index 190dba94e733da6e39b88f80ba8140e5dbd617a2..56d454cd80f4c119dce8588577f6261cf5017386 100644 GIT binary patch delta 45 zcmWFunV_Tb=H<+f{|~ih^Z1DC#UvXTTu5SIh%DpKWa*PlW&i?DS3j3^P6zopr0P5ovq5uE@ literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Transparent Background Gray.png.import b/Assets/Graphics/Transparent Background Gray.png.import new file mode 100644 index 000000000..530cfb806 --- /dev/null +++ b/Assets/Graphics/Transparent Background Gray.png.import @@ -0,0 +1,13 @@ +[remap] + +importer="image" +type="Image" +path="res://.import/Transparent Background Gray.png-0ba67df3c826cdf2e974e693683b6f48.image" + +[deps] + +source_file="res://Assets/Graphics/Transparent Background Gray.png" +dest_files=[ "res://.import/Transparent Background Gray.png-0ba67df3c826cdf2e974e693683b6f48.image" ] + +[params] + diff --git a/Main.tscn b/Main.tscn index 3bf4bbba4..494aa90e7 100644 --- a/Main.tscn +++ b/Main.tscn @@ -226,6 +226,7 @@ text = "[64×64]" align = 2 [node name="UI" type="HBoxContainer" parent="MenuAndUI"] +editor/display_folded = true margin_top = 28.0 margin_right = 1152.0 margin_bottom = 648.0 @@ -801,6 +802,7 @@ mouse_default_cursor_shape = 2 text = "Vertical" [node name="CanvasAndTimeline" type="VBoxContainer" parent="MenuAndUI/UI"] +editor/display_folded = true margin_left = 224.0 margin_right = 928.0 margin_bottom = 620.0 @@ -857,6 +859,7 @@ enabled_focus_mode = 0 script = ExtResource( 15 ) [node name="ViewportContainer" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler"] +editor/display_folded = true margin_left = 16.0 margin_right = 704.0 margin_bottom = 462.0 diff --git a/Scripts/Global.gd b/Scripts/Global.gd index bc6191e82..973c18cc6 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -207,7 +207,7 @@ func _ready() -> void: undo_redo = UndoRedo.new() transparent_background = ImageTexture.new() - transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Godot.png"), 0) + transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Dark.png"), 0) image_clipboard = Image.new() var root = get_tree().get_root() diff --git a/Scripts/PreferencesDialog.gd b/Scripts/PreferencesDialog.gd index 7b413f692..c59b6f71c 100644 --- a/Scripts/PreferencesDialog.gd +++ b/Scripts/PreferencesDialog.gd @@ -39,7 +39,7 @@ func change_theme(ID : int) -> void: ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres") elif ID == 1: #Gray Theme Global.theme_type = "Dark" - Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Godot.png"), 0) + Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Gray.png"), 0) VisualServer.set_default_clear_color(Color(0.301961, 0.301961, 0.301961)) main_theme = preload("res://Themes & Styles/Gray Theme/Gray Theme.tres") top_menu_style = preload("res://Themes & Styles/Gray Theme/GrayTopMenuStyle.tres") @@ -47,7 +47,7 @@ func change_theme(ID : int) -> void: elif ID == 2: #Godot's Theme Global.theme_type = "Dark" Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Godot.png"), 0) - VisualServer.set_default_clear_color(Color(0.301961, 0.301961, 0.301961)) + VisualServer.set_default_clear_color(Color(0.27451, 0.278431, 0.305882)) main_theme = preload("res://Themes & Styles/Godot\'s Theme/Godot\'s Theme.tres") top_menu_style = preload("res://Themes & Styles/Godot\'s Theme/TopMenuStyle.tres") ruler_style = preload("res://Themes & Styles/Godot\'s Theme/RulerStyle.tres")