diff --git a/Assets/Graphics/Canvas_split.png b/Assets/Graphics/Canvas_split.png new file mode 100644 index 000000000..ad4e99f94 Binary files /dev/null and b/Assets/Graphics/Canvas_split.png differ 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 000000000..6c36d5bff Binary files /dev/null and b/Assets/Graphics/Canvas_unsplit.png differ 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