From a2fdf7c4a59b5e52722fa387f8eb41f0d692c471 Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Mon, 2 Dec 2019 02:04:46 +0200
Subject: [PATCH] Changed split screen button icon

---
 Assets/Graphics/Canvas_split.png          | Bin 0 -> 648 bytes
 Assets/Graphics/Canvas_split.png.import   |  34 ++++++++++++++++++++++
 Assets/Graphics/Canvas_unsplit.png        | Bin 0 -> 650 bytes
 Assets/Graphics/Canvas_unsplit.png.import |  34 ++++++++++++++++++++++
 Main.tscn                                 |  21 +++++++------
 Scripts/Global.gd                         |   2 +-
 Scripts/Main.gd                           |   2 --
 7 files changed, 81 insertions(+), 12 deletions(-)
 create mode 100644 Assets/Graphics/Canvas_split.png
 create mode 100644 Assets/Graphics/Canvas_split.png.import
 create mode 100644 Assets/Graphics/Canvas_unsplit.png
 create mode 100644 Assets/Graphics/Canvas_unsplit.png.import

diff --git a/Assets/Graphics/Canvas_split.png b/Assets/Graphics/Canvas_split.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad4e99f9400cb4288f03bd10dfb65e222ef35222
GIT binary patch
literal 648
zcmV;30(bq1P)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CI6hju8UkfFM0K~%(1s#pXIrLEAagUO{|(4-+r
zad8w}3l4rPRvlcNb#-tR1i=pw7gr}m7b)?7X`w}o2gm(*ckglc4iM^PrkY(7fT~$W
zG8Ppx*;Uc^iarb@fDpzcX6o_OVj8aF>mDAy-bHwp`?)_yzmhW<;1P-Em~L3a8^kl4
zmd<&fILL~ULVQj<ZqNmZAGt0!`HgeIVS#4`jdXIJI7loOI#}*tRy0)NY2vV=YLqWz
znyhf%;;fddtaVTRLVr$MNpYR#5Mo$D90`b!QAG)5ScuT7kzyiA`%xGFpyN-FOD0zd
zj2sK7K!xP^!T;cQw`P87vYF(M0^KjR{V@Xgc7aCCw!e>UyKw?|pMfi_?XT2<*-z4I
zZ7qBR3~U1z*KJMS11@)f(3371k|TL(3i&+nen#Jv1p>D~?^?6B);>-jfHZZrd;=UD
z0;2`WUUzwSPiJrco@w>>1H!R##~@DgSpWb424YJ`L;!>UgaCxG%vneP000SaNLh0L
z01m?d01m?e$8V@)00007bV*G`2jdGJ6eS4*ryei>000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0001ANkl<ZD9@GByA8lF2u0D0_hcJ3VIQxQREd!A2dG|i
z5CViyX7*4hiD1r28Fc`_*a1~tW`MEkq^h`k%3E{;2~|Ks?*7jo^AT0yauGKuW(Lr@
i(|6n!jBf-``n?x#n?xeOxDMq20000<MNUMnLSTY#V+JDt

literal 0
HcmV?d00001

diff --git a/Assets/Graphics/Canvas_split.png.import b/Assets/Graphics/Canvas_split.png.import
new file mode 100644
index 000000000..7b0e2bdee
--- /dev/null
+++ b/Assets/Graphics/Canvas_split.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Canvas_split.png-5508e200bf1cdd5667f0f6bb5fb97913.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Canvas_split.png"
+dest_files=[ "res://.import/Canvas_split.png-5508e200bf1cdd5667f0f6bb5fb97913.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/Graphics/Canvas_unsplit.png b/Assets/Graphics/Canvas_unsplit.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c36d5bff092181c7f8de5478f84ea46083268f8
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CI6hju8UkfFM0K~%(1s#pXIrLEAagUO{|(4-+r
zad8w}3l4rPRvlcNb#-tR1i=pw7gr}m7b)?7X`w}o2gm(*ckglc4iM^PrkY(7fT~$W
zG8Ppx*;Uc^iarb@fDpzcX6o_OVj8aF>mDAy-bHwp`?)_yzmhW<;1P-Em~L3a8^kl4
zmd<&fILL~ULVQj<ZqNmZAGt0!`HgeIVS#4`jdXIJI7loOI#}*tRy0)NY2vV=YLqWz
znyhf%;;fddtaVTRLVr$MNpYR#5Mo$D90`b!QAG)5ScuT7kzyiA`%xGFpyN-FOD0zd
zj2sK7K!xP^!T;cQw`P87vYF(M0^KjR{V@Xgc7aCCw!e>UyKw?|pMfi_?XT2<*-z4I
zZ7qBR3~U1z*KJMS11@)f(3371k|TL(3i&+nen#Jv1p>D~?^?6B);>-jfHZZrd;=UD
z0;2`WUUzwSPiJrco@w>>1H!R##~@DgSpWb424YJ`L;!>UgaCxG%vneP000SaNLh0L
z01m?d01m?e$8V@)00007bV*G`2jdGJ6eI|3yC3HO000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0001CNkl<ZD9@GB(FwpX2u0DG?CCac;yzg^{c5pkOx3T4
zctFsGD^;B&s(CQRAdM;jpszqgw)utDhM7IXJ|9sA_Gs@D43UUnW}h6Q6WF3Z0MJww
kpmeAExFzV{2q5))7x4T<B8IW6i~s-t07*qoM6N<$f*<$`RsaA1

literal 0
HcmV?d00001

diff --git a/Assets/Graphics/Canvas_unsplit.png.import b/Assets/Graphics/Canvas_unsplit.png.import
new file mode 100644
index 000000000..71668186b
--- /dev/null
+++ b/Assets/Graphics/Canvas_unsplit.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Canvas_unsplit.png-26c4de7c36c0d167fcb3541bbe59e403.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Canvas_unsplit.png"
+dest_files=[ "res://.import/Canvas_unsplit.png-26c4de7c36c0d167fcb3541bbe59e403.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Main.tscn b/Main.tscn
index f568a2218..96cca61a7 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=44 format=2]
+[gd_scene load_steps=46 format=2]
 
 [ext_resource path="res://Scripts/Main.gd" type="Script" id=1]
 [ext_resource path="res://Assets/Graphics/Tools/RectSelect.png" type="Texture" id=2]
@@ -37,7 +37,9 @@
 [ext_resource path="res://Assets/Graphics/Layers/merge_down.png" type="Texture" id=35]
 [ext_resource path="res://Assets/Graphics/Layers/merge_down_disabled.png" type="Texture" id=36]
 [ext_resource path="res://Prefabs/BrushButton.tscn" type="PackedScene" id=37]
-[ext_resource path="res://Scripts/AboutDialog.gd" type="Script" id=38]
+[ext_resource path="res://Assets/Graphics/Canvas_split.png" type="Texture" id=38]
+[ext_resource path="res://Assets/Graphics/Canvas_unsplit.png" type="Texture" id=39]
+[ext_resource path="res://Scripts/AboutDialog.gd" type="Script" id=40]
 
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0.223529, 0.223529, 0.243137, 1 )
@@ -1097,16 +1099,17 @@ scroll_horizontal_enabled = false
 [node name="ProjectBrushContainer" type="GridContainer" parent="BrushesPopup/TabContainer/Project"]
 columns = 5
 
-[node name="SplitScreenButton" type="Button" parent="."]
+[node name="SplitScreenButton" type="TextureButton" parent="."]
 anchor_left = 1.0
 anchor_right = 1.0
-margin_left = -244.0
-margin_top = 45.0
-margin_right = -224.0
-margin_bottom = 65.0
+margin_left = -236.921
+margin_top = 44.4745
+margin_right = -223.921
+margin_bottom = 57.4745
 size_flags_vertical = 0
 toggle_mode = true
-text = "<"
+texture_normal = ExtResource( 38 )
+texture_pressed = ExtResource( 39 )
 
 [node name="CreateNewImage" type="ConfirmationDialog" parent="."]
 editor/display_folded = true
@@ -1318,7 +1321,7 @@ editor/display_folded = true
 margin_right = 284.0
 margin_bottom = 186.0
 window_title = "About Pixelorama"
-script = ExtResource( 38 )
+script = ExtResource( 40 )
 
 [node name="AboutUI" type="VBoxContainer" parent="AboutDialog"]
 margin_left = 8.0
diff --git a/Scripts/Global.gd b/Scripts/Global.gd
index 2f0d7c0ab..d08401e7b 100644
--- a/Scripts/Global.gd
+++ b/Scripts/Global.gd
@@ -26,7 +26,7 @@ var canvas_parent : Node
 var main_viewport : ViewportContainer
 var second_viewport : ViewportContainer
 var viewport_separator : VSeparator
-var split_screen_button : Button
+var split_screen_button : BaseButton
 # warning-ignore:unused_class_variable
 var left_square_indicator_visible := true
 # warning-ignore:unused_class_variable
diff --git a/Scripts/Main.gd b/Scripts/Main.gd
index 83ddc8872..dc1335d29 100644
--- a/Scripts/Main.gd
+++ b/Scripts/Main.gd
@@ -827,11 +827,9 @@ func _on_BlueRedMode_toggled(button_pressed) -> void:
 
 func _on_SplitScreenButton_toggled(button_pressed) -> void:
 	if button_pressed:
-		Global.split_screen_button.text = ">"
 		Global.viewport_separator.visible = true
 		Global.second_viewport.visible = true
 	else:
-		Global.split_screen_button.text = "<"
 		Global.viewport_separator.visible = false
 		Global.second_viewport.visible = false