From 543e9d9008b5251eed7e07e73528ba5b0d7e7825 Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Fri, 14 Feb 2020 18:26:03 +0200
Subject: [PATCH] Hide pressure sensitivity settings

Due to complications and priority shifts, tablet pen pressure sensitivity will not be included in v0.6.2
---
 Changelog.md                           |  4 ++--
 Main.tscn                              | 12 ++++++++----
 Prefabs/Dialogs/PreferencesDialog.tscn |  2 ++
 Scripts/Global.gd                      |  4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index cc549a54f..6fcf0eae5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,11 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 - Image layer rotation! Choose between 2 rotation algorithms, Rotxel and Nearest Neighbour - Thanks to azagaya!
-- Tablet pen pressure sensitivity!
 - Crowdin integration for contributing translations!
 - Spanish translation - thanks to azagaya & Lilly And!
 - Chinese Simplified translation - thanks to Chenxu Wang!
-- Latvian translation - thanks to nezvers!
+- Latvian translation - thanks to Agnis Aldiņš (NeZvers)!
 - Translators can now be seen in the About window.
 - It is now possible to remove custom brushes with the middle mouse button.
 - Added HSV mode to the color picker. (Added automatically because of the Godot 3.2 update)
@@ -34,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Possibly fixed crashes with motion drawing and undo/redoing.
 - Fixed bug (which also caused crashes sometimes) when generating an outline inside the image and it was going outside the canvas' borders.
 - Fixed crash when importing images that were failing to load. They still fail to load, but Pixelorama does not crash.
+- Possibly fixed a rare crash where the cursor image was failing to load. It is now being loaded only once.
 
 ## [v0.6.1] - 13-01-2020
 
diff --git a/Main.tscn b/Main.tscn
index e24945674..a09e8e7d8 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -457,17 +457,19 @@ align = 1
 
 [node name="LeftIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 margin_top = 19.0
-margin_right = 208.0
+margin_right = 119.0
 margin_bottom = 35.0
 hint_tooltip = "LEFT_INDIC_HT"
 mouse_default_cursor_shape = 2
+size_flags_horizontal = 0
 pressed = true
 text = "Left pixel indicator"
 
 [node name="LeftToolIconCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 margin_top = 39.0
-margin_right = 208.0
+margin_right = 100.0
 margin_bottom = 55.0
+size_flags_horizontal = 0
 pressed = true
 text = "Show tool icon"
 
@@ -703,16 +705,18 @@ align = 1
 
 [node name="RightIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
 margin_top = 19.0
-margin_right = 208.0
+margin_right = 127.0
 margin_bottom = 35.0
 hint_tooltip = "RIGHT_INDIC_HT"
 mouse_default_cursor_shape = 2
+size_flags_horizontal = 0
 text = "Right pixel indicator"
 
 [node name="RightToolIconCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
 margin_top = 39.0
-margin_right = 208.0
+margin_right = 100.0
 margin_bottom = 55.0
+size_flags_horizontal = 0
 pressed = true
 text = "Show tool icon"
 
diff --git a/Prefabs/Dialogs/PreferencesDialog.tscn b/Prefabs/Dialogs/PreferencesDialog.tscn
index a3a18004e..c069c3040 100644
--- a/Prefabs/Dialogs/PreferencesDialog.tscn
+++ b/Prefabs/Dialogs/PreferencesDialog.tscn
@@ -51,6 +51,7 @@ margin_bottom = 66.0
 [node name="General Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"]
 margin_right = 334.0
 margin_bottom = 14.0
+rect_min_size = Vector2( 0, 28 )
 text = "General Options"
 
 [node name="SmoothZoom" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"]
@@ -62,6 +63,7 @@ pressed = true
 text = "Smooth Zoom"
 
 [node name="PressureSentivity" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"]
+visible = false
 margin_top = 46.0
 margin_right = 334.0
 margin_bottom = 66.0
diff --git a/Scripts/Global.gd b/Scripts/Global.gd
index 2a8670a1c..93918d309 100644
--- a/Scripts/Global.gd
+++ b/Scripts/Global.gd
@@ -1,6 +1,6 @@
 extends Node
 
-enum Pressure_Sensitivity {NONE, ALPHA, SIZE}
+enum Pressure_Sensitivity {NONE, ALPHA, SIZE, ALPHA_AND_SIZE}
 enum Brush_Types {PIXEL, CIRCLE, FILLED_CIRCLE, FILE, RANDOM_FILE, CUSTOM}
 
 var root_directory := "."
@@ -19,7 +19,7 @@ var has_focus := false
 var canvases := []
 # warning-ignore:unused_class_variable
 var hidden_canvases := []
-var pressure_sensitivity_mode = Pressure_Sensitivity.ALPHA
+var pressure_sensitivity_mode = Pressure_Sensitivity.NONE
 var smooth_zoom := true
 var cursor_image = preload("res://Assets/Graphics/Cursor.png")
 var left_cursor_tool_texture : ImageTexture