Changes to the tool options UI

New option for the color picker tool (closes #115 - also includes new translatable strings), VSplitContainer for the tools and their options and a ScrollContainer for the tool options.

Changelog.md

@@ -6,16 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [v0.6.1] - Unreleased
 
 ### Added
-- Italian localization - thanks to Marco Galli!
+- Italian translation - thanks to Marco Galli!
 - In addition to the middle mouse button, you can now use `Space` to pan around the canvas.
+- The ability to choose for which color the color picker does its job, the left or the right. (Issue #115)
 
 ### Changed
 - When saving a .pxo file, the file path (along with the file name) gets remembered by the Export PNG file dialog path. (Issue #114)
-- More translatable strings, updates to Greek & Brazilian Portuguese (thanks to YeldhamDev) localizations.
+- More translatable strings, updates to Greek & Brazilian Portuguese (thanks to YeldhamDev) translations.
 - The dark theme button is now pressed by default if the user hasn't saved a theme preference in the config file.
-- Added a VSplitContainer for Palettes and Layers.
+- Added a VSplitContainer for the tools and their options, and another one for Palettes and Layers.
+- Made minor changes to the UI of tool options, including a ScrollContainer for them.
 - Added a ScrollContainer for the palette buttons on the Edit Palette popup.
-- Made Palette .json files more readable, and made "comments" on top of the color data.
+- Made Palette .json files more readable, and placed "comments" on top of the color data.
 - The grid options are now being updated realtime when they're being changed from the preferences, and they are also being saved in the config cache file.
 
 ### Fixed

Main.tscn

@@ -284,7 +284,7 @@ margin_bottom = 620.0
 rect_min_size = Vector2( 224, 0 )
 size_flags_vertical = 3
 
-[node name="Tools" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel"]
+[node name="Tools" type="VSplitContainer" parent="MenuAndUI/UI/ToolPanel"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 8.0
@@ -292,6 +292,7 @@ margin_top = 8.0
 margin_right = -8.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+custom_constants/autohide = 0
 custom_constants/separation = 32
 
 [node name="MenusAndTools" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools"]
@@ -425,12 +426,11 @@ margin_right = 208.0
 margin_bottom = 612.0
 size_flags_vertical = 3
 custom_constants/separation = 8
-alignment = 1
 
 [node name="ColorButtonsVertical" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
-margin_top = 50.0
+editor/display_folded = true
 margin_right = 208.0
-margin_bottom = 101.0
+margin_bottom = 51.0
 custom_constants/separation = 2
 
 [node name="ColorSwitchCenter" type="CenterContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical"]
@@ -497,22 +497,34 @@ mouse_default_cursor_shape = 2
 texture_normal = ExtResource( 11 )
 
 [node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
-margin_top = 109.0
+margin_top = 59.0
 margin_right = 208.0
-margin_bottom = 113.0
+margin_bottom = 63.0
 
-[node name="LeftToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
+[node name="ScrollContainer" type="ScrollContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
-margin_top = 121.0
+margin_top = 71.0
 margin_right = 208.0
-margin_bottom = 252.0
+margin_bottom = 453.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
 
-[node name="LeftLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
+[node name="ToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer"]
+margin_right = 208.0
+margin_bottom = 312.0
+size_flags_horizontal = 3
+
+[node name="LeftToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions"]
+editor/display_folded = true
+margin_right = 208.0
+margin_bottom = 150.0
+
+[node name="LeftLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 margin_right = 208.0
 margin_bottom = 15.0
 text = "Left tool options"
 align = 1
 
-[node name="LeftIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
+[node name="LeftIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 margin_top = 19.0
 margin_right = 208.0
 margin_bottom = 35.0
@@ -521,13 +533,13 @@ mouse_default_cursor_shape = 2
 pressed = true
 text = "Left pixel indicator"
 
-[node name="LeftBrushType" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
+[node name="LeftBrushType" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 editor/display_folded = true
 margin_top = 39.0
 margin_right = 208.0
 margin_bottom = 71.0
 
-[node name="LeftBrushTypeButton" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushType"]
+[node name="LeftBrushTypeButton" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushType"]
 margin_right = 36.0
 margin_bottom = 32.0
 rect_min_size = Vector2( 36, 32 )
@@ -536,34 +548,37 @@ mouse_default_cursor_shape = 2
 size_flags_horizontal = 0
 texture_normal = ExtResource( 12 )
 
-[node name="BrushTexture" type="TextureRect" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushType/LeftBrushTypeButton"]
+[node name="BrushTexture" type="TextureRect" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushType/LeftBrushTypeButton"]
 margin_right = 32.0
 margin_bottom = 32.0
 texture = SubResource( 4 )
 expand = true
 stretch_mode = 6
 
-[node name="LeftBrushTypeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushType"]
+[node name="LeftBrushTypeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushType"]
 margin_left = 40.0
 margin_top = 8.0
 margin_right = 103.0
 margin_bottom = 23.0
 text = "Brush: Pixel"
 
-[node name="LeftBrushSize" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
+[node name="LeftBrushSize" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 editor/display_folded = true
 margin_top = 75.0
 margin_right = 208.0
-margin_bottom = 92.0
+margin_bottom = 111.0
 
-[node name="BrushSizeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushSize"]
+[node name="BrushSizeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushSize"]
-margin_top = 1.0
+margin_right = 208.0
-margin_right = 58.0
+margin_bottom = 15.0
-margin_bottom = 16.0
 text = "Brush size:"
 
-[node name="LeftBrushSizeSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushSize"]
+[node name="HBoxContainer" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushSize"]
-margin_left = 62.0
+margin_top = 19.0
+margin_right = 208.0
+margin_bottom = 36.0
+
+[node name="LeftBrushSizeSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushSize/HBoxContainer"]
 margin_right = 150.0
 margin_bottom = 17.0
 mouse_default_cursor_shape = 2
@@ -574,7 +589,7 @@ value = 1.0
 allow_greater = true
 ticks_on_borders = true
 
-[node name="LeftBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushSize"]
+[node name="LeftBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushSize/HBoxContainer"]
 margin_left = 154.0
 margin_right = 208.0
 margin_bottom = 17.0
@@ -584,270 +599,55 @@ value = 1.0
 align = 1
 suffix = "px"
 
-[node name="LeftColorInterpolation" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
+[node name="LeftColorInterpolation" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 editor/display_folded = true
 visible = false
-margin_top = 96.0
+margin_top = 115.0
 margin_right = 208.0
-margin_bottom = 113.0
+margin_bottom = 151.0
 
-[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftColorInterpolation"]
+[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorInterpolation"]
-margin_top = 1.0
+margin_right = 208.0
-margin_right = 90.0
+margin_bottom = 15.0
-margin_bottom = 16.0
 hint_tooltip = "COLORFROM_HT"
 text = "Brush color from"
 
-[node name="LeftInterpolateSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftColorInterpolation"]
+[node name="HBoxContainer" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorInterpolation"]
-margin_left = 94.0
+margin_top = 19.0
-margin_right = 149.0
-margin_bottom = 17.0
-hint_tooltip = "COLORFROM_HT"
-size_flags_horizontal = 3
-size_flags_vertical = 1
-value = 100.0
-ticks_on_borders = true
-
-[node name="LeftInterpolateFactor" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftColorInterpolation"]
-margin_left = 153.0
 margin_right = 208.0
-margin_bottom = 17.0
+margin_bottom = 36.0
-hint_tooltip = "COLORFROM_HT"
-size_flags_horizontal = 3
-value = 100.0
 
-[node name="LeftFillArea" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
+[node name="LeftInterpolateSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorInterpolation/HBoxContainer"]
-editor/display_folded = true
-visible = false
-margin_top = 110.0
-margin_right = 214.0
-margin_bottom = 148.0
-
-[node name="FillAreaLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftFillArea"]
-margin_right = 214.0
-margin_bottom = 14.0
-mouse_default_cursor_shape = 2
-text = "Fill area:"
-
-[node name="LeftFillAreaOptions" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftFillArea"]
-margin_top = 18.0
-margin_right = 214.0
-margin_bottom = 38.0
-mouse_default_cursor_shape = 2
-text = "Area of the same color"
-items = [ "Area of the same color", null, false, 0, null, "All pixels of the same color", null, false, 1, null ]
-selected = 0
-
-[node name="LeftLDOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
-editor/display_folded = true
-visible = false
-margin_top = 96.0
-margin_right = 208.0
-margin_bottom = 140.0
-
-[node name="LeftLightenDarken" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions"]
-margin_right = 208.0
-margin_bottom = 23.0
-mouse_default_cursor_shape = 2
-text = "Lighten"
-items = [ "Lighten", null, false, 0, null, "Darken", null, false, 1, null ]
-selected = 0
-
-[node name="LeftLDAmount" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions"]
-margin_top = 27.0
-margin_right = 208.0
-margin_bottom = 44.0
-
-[node name="LDAmountLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount"]
-margin_top = 1.0
-margin_right = 47.0
-margin_bottom = 16.0
-text = "Amount:"
-
-[node name="LeftLDAmountSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount"]
-margin_left = 51.0
 margin_right = 150.0
 margin_bottom = 17.0
-hint_tooltip = "LDAMOUNT_HT"
+hint_tooltip = "COLORFROM_HT"
-mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 size_flags_vertical = 1
-value = 10.0
+value = 100.0
 ticks_on_borders = true
 
-[node name="LeftLDAmountSpinbox" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount"]
+[node name="LeftInterpolateFactor" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorInterpolation/HBoxContainer"]
 margin_left = 154.0
 margin_right = 208.0
 margin_bottom = 17.0
-hint_tooltip = "LDAMOUNT_HT"
+hint_tooltip = "COLORFROM_HT"
-mouse_default_cursor_shape = 2
+value = 100.0
-value = 10.0
-
-[node name="LeftMirroring" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
-editor/display_folded = true
-margin_top = 96.0
-margin_right = 208.0
-margin_bottom = 131.0
-
-[node name="Label" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring"]
-margin_right = 208.0
-margin_bottom = 15.0
-text = "Mirroring"
-
-[node name="LeftMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring"]
-margin_top = 19.0
-margin_right = 208.0
-margin_bottom = 35.0
-
-[node name="LeftHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons"]
-margin_right = 77.0
-margin_bottom = 16.0
-hint_tooltip = "HORIZMIRROR_HT"
-mouse_default_cursor_shape = 2
-text = "Horizontal"
-
-[node name="LeftVerticalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons"]
-margin_left = 81.0
-margin_right = 142.0
-margin_bottom = 16.0
-hint_tooltip = "VERTMIRROR_HT"
-mouse_default_cursor_shape = 2
-text = "Vertical"
-
-[node name="HSeparator2" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
-margin_top = 260.0
-margin_right = 208.0
-margin_bottom = 264.0
-
-[node name="RightToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
-margin_top = 272.0
-margin_right = 208.0
-margin_bottom = 403.0
-
-[node name="RightLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
-margin_right = 208.0
-margin_bottom = 15.0
-text = "Right tool options"
 align = 1
 
-[node name="RightIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
+[node name="LeftFillArea" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
-margin_top = 19.0
-margin_right = 208.0
-margin_bottom = 35.0
-hint_tooltip = "RIGHT_INDIC_HT"
-mouse_default_cursor_shape = 2
-text = "Right pixel indicator"
-
-[node name="RightBrushType" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
-editor/display_folded = true
-margin_top = 39.0
-margin_right = 208.0
-margin_bottom = 71.0
-
-[node name="RightBrushTypeButton" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushType"]
-margin_right = 36.0
-margin_bottom = 32.0
-rect_min_size = Vector2( 36, 32 )
-hint_tooltip = "BRUSH_HT"
-mouse_default_cursor_shape = 2
-size_flags_horizontal = 0
-texture_normal = ExtResource( 12 )
-
-[node name="BrushTexture" type="TextureRect" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushType/RightBrushTypeButton"]
-margin_right = 32.0
-margin_bottom = 32.0
-texture = SubResource( 6 )
-expand = true
-stretch_mode = 6
-
-[node name="RightBrushTypeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushType"]
-margin_left = 40.0
-margin_top = 8.0
-margin_right = 103.0
-margin_bottom = 23.0
-text = "Brush: Pixel"
-
-[node name="RightBrushSize" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
-editor/display_folded = true
-margin_top = 75.0
-margin_right = 208.0
-margin_bottom = 92.0
-
-[node name="BrushSizeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushSize"]
-margin_top = 1.0
-margin_right = 58.0
-margin_bottom = 16.0
-text = "Brush size:"
-
-[node name="RightBrushSizeSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushSize"]
-margin_left = 62.0
-margin_right = 150.0
-margin_bottom = 17.0
-mouse_default_cursor_shape = 2
-size_flags_horizontal = 3
-size_flags_vertical = 1
-min_value = 1.0
-value = 1.0
-allow_greater = true
-ticks_on_borders = true
-
-[node name="RightBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushSize"]
-margin_left = 154.0
-margin_right = 208.0
-margin_bottom = 17.0
-mouse_default_cursor_shape = 2
-min_value = 1.0
-value = 1.0
-align = 1
-suffix = "px"
-
-[node name="RightColorInterpolation" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
 editor/display_folded = true
 visible = false
-margin_top = 96.0
+margin_top = 155.0
 margin_right = 208.0
-margin_bottom = 113.0
+margin_bottom = 197.0
 
-[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightColorInterpolation"]
+[node name="FillAreaLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftFillArea"]
-margin_top = 1.0
-margin_right = 90.0
-margin_bottom = 16.0
-hint_tooltip = "COLORFROM_HT"
-text = "Brush color from"
-
-[node name="RightInterpolateSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightColorInterpolation"]
-margin_left = 94.0
-margin_right = 149.0
-margin_bottom = 17.0
-hint_tooltip = "COLORFROM_HT"
-mouse_default_cursor_shape = 2
-size_flags_horizontal = 3
-size_flags_vertical = 1
-value = 100.0
-ticks_on_borders = true
-
-[node name="RightInterpolateFactor" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightColorInterpolation"]
-margin_left = 153.0
-margin_right = 208.0
-margin_bottom = 17.0
-hint_tooltip = "COLORFROM_HT"
-mouse_default_cursor_shape = 2
-size_flags_horizontal = 3
-value = 100.0
-
-[node name="RightFillArea" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
-editor/display_folded = true
-visible = false
-margin_top = 96.0
-margin_right = 208.0
-margin_bottom = 138.0
-
-[node name="FillAreaLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightFillArea"]
 margin_right = 208.0
 margin_bottom = 15.0
+mouse_default_cursor_shape = 2
 text = "Fill area:"
 
-[node name="RightFillAreaOptions" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightFillArea"]
+[node name="LeftFillAreaOptions" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftFillArea"]
 margin_top = 19.0
 margin_right = 208.0
 margin_bottom = 42.0
@@ -856,14 +656,14 @@ text = "Area of the same color"
 items = [ "Area of the same color", null, false, 0, null, "All pixels of the same color", null, false, 1, null ]
 selected = 0
 
-[node name="RightLDOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
+[node name="LeftLDOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 editor/display_folded = true
 visible = false
-margin_top = 96.0
+margin_top = 115.0
 margin_right = 208.0
-margin_bottom = 140.0
+margin_bottom = 178.0
 
-[node name="RightLightenDarken" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions"]
+[node name="LeftLightenDarken" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftLDOptions"]
 margin_right = 208.0
 margin_bottom = 23.0
 mouse_default_cursor_shape = 2
@@ -871,19 +671,18 @@ text = "Lighten"
 items = [ "Lighten", null, false, 0, null, "Darken", null, false, 1, null ]
 selected = 0
 
-[node name="RightLDAmount" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions"]
+[node name="LDAmountLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftLDOptions"]
 margin_top = 27.0
 margin_right = 208.0
-margin_bottom = 44.0
+margin_bottom = 42.0
-
-[node name="LDAmountLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions/RightLDAmount"]
-margin_top = 1.0
-margin_right = 47.0
-margin_bottom = 16.0
 text = "Amount:"
 
-[node name="RightLDAmountSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions/RightLDAmount"]
+[node name="LeftLDAmount" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftLDOptions"]
-margin_left = 51.0
+margin_top = 46.0
+margin_right = 208.0
+margin_bottom = 63.0
+
+[node name="LeftLDAmountSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount"]
 margin_right = 150.0
 margin_bottom = 17.0
 hint_tooltip = "LDAMOUNT_HT"
@@ -893,38 +692,308 @@ size_flags_vertical = 1
 value = 10.0
 ticks_on_borders = true
 
-[node name="RightLDAmountSpinbox" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions/RightLDAmount"]
+[node name="LeftLDAmountSpinbox" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount"]
 margin_left = 154.0
 margin_right = 208.0
 margin_bottom = 17.0
 hint_tooltip = "LDAMOUNT_HT"
 mouse_default_cursor_shape = 2
 value = 10.0
+align = 1
 
-[node name="RightMirroring" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
+[node name="LeftColorPickerOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
 editor/display_folded = true
-margin_top = 96.0
+visible = false
+margin_top = 115.0
 margin_right = 208.0
-margin_bottom = 131.0
+margin_bottom = 157.0
 
-[node name="Label" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring"]
+[node name="Label" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorPickerOptions"]
+margin_right = 208.0
+margin_bottom = 15.0
+mouse_default_cursor_shape = 2
+text = "Pick for:"
+
+[node name="LeftForColorOptions" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorPickerOptions"]
+margin_top = 19.0
+margin_right = 208.0
+margin_bottom = 42.0
+mouse_default_cursor_shape = 2
+text = "Left Color"
+items = [ "Left Color", null, false, 0, null, "Right Color", null, false, 1, null ]
+selected = 0
+
+[node name="LeftMirroring" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"]
+editor/display_folded = true
+margin_top = 115.0
+margin_right = 208.0
+margin_bottom = 150.0
+
+[node name="Label" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftMirroring"]
 margin_right = 208.0
 margin_bottom = 15.0
 text = "Mirroring"
 
-[node name="RightMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring"]
+[node name="LeftMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftMirroring"]
 margin_top = 19.0
 margin_right = 208.0
 margin_bottom = 35.0
 
-[node name="RightHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons"]
+[node name="LeftHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons"]
 margin_right = 77.0
 margin_bottom = 16.0
 hint_tooltip = "HORIZMIRROR_HT"
 mouse_default_cursor_shape = 2
 text = "Horizontal"
 
-[node name="RightVerticalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons"]
+[node name="LeftVerticalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons"]
+margin_left = 81.0
+margin_right = 142.0
+margin_bottom = 16.0
+hint_tooltip = "VERTMIRROR_HT"
+mouse_default_cursor_shape = 2
+text = "Vertical"
+
+[node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions"]
+margin_top = 154.0
+margin_right = 208.0
+margin_bottom = 158.0
+
+[node name="RightToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions"]
+editor/display_folded = true
+margin_top = 162.0
+margin_right = 208.0
+margin_bottom = 312.0
+
+[node name="RightLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
+margin_right = 208.0
+margin_bottom = 15.0
+text = "Right tool options"
+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_bottom = 35.0
+hint_tooltip = "RIGHT_INDIC_HT"
+mouse_default_cursor_shape = 2
+text = "Right pixel indicator"
+
+[node name="RightBrushType" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
+editor/display_folded = true
+margin_top = 39.0
+margin_right = 208.0
+margin_bottom = 71.0
+
+[node name="RightBrushTypeButton" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushType"]
+margin_right = 36.0
+margin_bottom = 32.0
+rect_min_size = Vector2( 36, 32 )
+hint_tooltip = "BRUSH_HT"
+mouse_default_cursor_shape = 2
+size_flags_horizontal = 0
+texture_normal = ExtResource( 12 )
+
+[node name="BrushTexture" type="TextureRect" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushType/RightBrushTypeButton"]
+margin_right = 32.0
+margin_bottom = 32.0
+texture = SubResource( 6 )
+expand = true
+stretch_mode = 6
+
+[node name="RightBrushTypeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushType"]
+margin_left = 40.0
+margin_top = 8.0
+margin_right = 103.0
+margin_bottom = 23.0
+text = "Brush: Pixel"
+
+[node name="RightBrushSize" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
+editor/display_folded = true
+margin_top = 75.0
+margin_right = 208.0
+margin_bottom = 111.0
+
+[node name="BrushSizeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushSize"]
+margin_right = 208.0
+margin_bottom = 15.0
+text = "Brush size:"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushSize"]
+margin_top = 19.0
+margin_right = 208.0
+margin_bottom = 36.0
+
+[node name="RightBrushSizeSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushSize/HBoxContainer"]
+margin_right = 150.0
+margin_bottom = 17.0
+mouse_default_cursor_shape = 2
+size_flags_horizontal = 3
+size_flags_vertical = 1
+min_value = 1.0
+value = 1.0
+allow_greater = true
+ticks_on_borders = true
+
+[node name="RightBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushSize/HBoxContainer"]
+margin_left = 154.0
+margin_right = 208.0
+margin_bottom = 17.0
+mouse_default_cursor_shape = 2
+min_value = 1.0
+value = 1.0
+align = 1
+suffix = "px"
+
+[node name="RightColorInterpolation" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
+editor/display_folded = true
+visible = false
+margin_top = 115.0
+margin_right = 208.0
+margin_bottom = 151.0
+
+[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorInterpolation"]
+margin_right = 208.0
+margin_bottom = 15.0
+hint_tooltip = "COLORFROM_HT"
+text = "Brush color from"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorInterpolation"]
+margin_top = 19.0
+margin_right = 208.0
+margin_bottom = 36.0
+
+[node name="RightInterpolateSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorInterpolation/HBoxContainer"]
+margin_right = 102.0
+margin_bottom = 17.0
+hint_tooltip = "COLORFROM_HT"
+mouse_default_cursor_shape = 2
+size_flags_horizontal = 3
+size_flags_vertical = 1
+value = 100.0
+ticks_on_borders = true
+
+[node name="RightInterpolateFactor" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorInterpolation/HBoxContainer"]
+margin_left = 106.0
+margin_right = 208.0
+margin_bottom = 17.0
+hint_tooltip = "COLORFROM_HT"
+mouse_default_cursor_shape = 2
+value = 100.0
+align = 1
+
+[node name="RightFillArea" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
+editor/display_folded = true
+visible = false
+margin_top = 96.0
+margin_right = 208.0
+margin_bottom = 138.0
+
+[node name="FillAreaLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightFillArea"]
+margin_right = 208.0
+margin_bottom = 15.0
+text = "Fill area:"
+
+[node name="RightFillAreaOptions" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightFillArea"]
+margin_top = 19.0
+margin_right = 208.0
+margin_bottom = 42.0
+mouse_default_cursor_shape = 2
+text = "Area of the same color"
+items = [ "Area of the same color", null, false, 0, null, "All pixels of the same color", null, false, 1, null ]
+selected = 0
+
+[node name="RightLDOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
+editor/display_folded = true
+visible = false
+margin_top = 115.0
+margin_right = 208.0
+margin_bottom = 178.0
+
+[node name="RightLightenDarken" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightLDOptions"]
+margin_right = 208.0
+margin_bottom = 23.0
+mouse_default_cursor_shape = 2
+text = "Lighten"
+items = [ "Lighten", null, false, 0, null, "Darken", null, false, 1, null ]
+selected = 0
+
+[node name="LDAmountLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightLDOptions"]
+margin_top = 27.0
+margin_right = 208.0
+margin_bottom = 42.0
+text = "Amount:"
+
+[node name="RightLDAmount" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightLDOptions"]
+margin_top = 46.0
+margin_right = 208.0
+margin_bottom = 63.0
+
+[node name="RightLDAmountSlider" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightLDOptions/RightLDAmount"]
+margin_right = 150.0
+margin_bottom = 17.0
+hint_tooltip = "LDAMOUNT_HT"
+mouse_default_cursor_shape = 2
+size_flags_horizontal = 3
+size_flags_vertical = 1
+value = 10.0
+ticks_on_borders = true
+
+[node name="RightLDAmountSpinbox" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightLDOptions/RightLDAmount"]
+margin_left = 154.0
+margin_right = 208.0
+margin_bottom = 17.0
+hint_tooltip = "LDAMOUNT_HT"
+mouse_default_cursor_shape = 2
+value = 10.0
+align = 1
+
+[node name="RightColorPickerOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
+editor/display_folded = true
+visible = false
+margin_top = 115.0
+margin_right = 208.0
+margin_bottom = 157.0
+
+[node name="Label" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorPickerOptions"]
+margin_right = 208.0
+margin_bottom = 15.0
+mouse_default_cursor_shape = 2
+text = "Pick for:"
+
+[node name="RightForColorOptions" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorPickerOptions"]
+margin_top = 19.0
+margin_right = 208.0
+margin_bottom = 42.0
+mouse_default_cursor_shape = 2
+text = "Right Color"
+items = [ "Left Color", null, false, 0, null, "Right Color", null, false, 1, null ]
+selected = 1
+
+[node name="RightMirroring" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"]
+editor/display_folded = true
+margin_top = 115.0
+margin_right = 208.0
+margin_bottom = 150.0
+
+[node name="Label" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightMirroring"]
+margin_right = 208.0
+margin_bottom = 15.0
+text = "Mirroring"
+
+[node name="RightMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightMirroring"]
+margin_top = 19.0
+margin_right = 208.0
+margin_bottom = 35.0
+
+[node name="RightHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons"]
+margin_right = 77.0
+margin_bottom = 16.0
+hint_tooltip = "HORIZMIRROR_HT"
+mouse_default_cursor_shape = 2
+text = "Horizontal"
+
+[node name="RightVerticalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons"]
 margin_left = 81.0
 margin_right = 142.0
 margin_bottom = 16.0
@@ -1740,30 +1809,32 @@ visible = false
 [connection signal="popup_closed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/RightColorPickerButton" to="." method="_can_draw_true"]
 [connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/RightColorPickerButton" to="." method="_can_draw_false"]
 [connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorDefaultsCenter/ColorDefaults" to="." method="_on_ColorDefaults_pressed"]
-[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftIndicatorCheckbox" to="." method="_on_LeftIndicatorCheckbox_toggled"]
+[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftIndicatorCheckbox" to="." method="_on_LeftIndicatorCheckbox_toggled"]
-[connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushType/LeftBrushTypeButton" to="." method="_on_LeftBrushTypeButton_pressed"]
+[connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushType/LeftBrushTypeButton" to="." method="_on_LeftBrushTypeButton_pressed"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushSize/LeftBrushSizeSlider" to="." method="_on_LeftBrushSizeEdit_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushSize/HBoxContainer/LeftBrushSizeSlider" to="." method="_on_LeftBrushSizeEdit_value_changed"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushSize/LeftBrushSizeEdit" to="." method="_on_LeftBrushSizeEdit_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushSize/HBoxContainer/LeftBrushSizeEdit" to="." method="_on_LeftBrushSizeEdit_value_changed"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftColorInterpolation/LeftInterpolateSlider" to="." method="_on_LeftInterpolateFactor_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorInterpolation/HBoxContainer/LeftInterpolateSlider" to="." method="_on_LeftInterpolateFactor_value_changed"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftColorInterpolation/LeftInterpolateFactor" to="." method="_on_LeftInterpolateFactor_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorInterpolation/HBoxContainer/LeftInterpolateFactor" to="." method="_on_LeftInterpolateFactor_value_changed"]
-[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftFillArea/LeftFillAreaOptions" to="." method="_on_LeftFillAreaOptions_item_selected"]
+[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftFillArea/LeftFillAreaOptions" to="." method="_on_LeftFillAreaOptions_item_selected"]
-[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions/LeftLightenDarken" to="." method="_on_LeftLightenDarken_item_selected"]
+[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftLDOptions/LeftLightenDarken" to="." method="_on_LeftLightenDarken_item_selected"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount/LeftLDAmountSlider" to="." method="_on_LeftLDAmountSpinbox_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount/LeftLDAmountSlider" to="." method="_on_LeftLDAmountSpinbox_value_changed"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount/LeftLDAmountSpinbox" to="." method="_on_LeftLDAmountSpinbox_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount/LeftLDAmountSpinbox" to="." method="_on_LeftLDAmountSpinbox_value_changed"]
-[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons/LeftHorizontalMirroring" to="." method="_on_LeftHorizontalMirroring_toggled"]
+[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftColorPickerOptions/LeftForColorOptions" to="." method="_on_LeftForColorOptions_item_selected"]
-[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons/LeftVerticalMirroring" to="." method="_on_LeftVerticalMirroring_toggled"]
+[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons/LeftHorizontalMirroring" to="." method="_on_LeftHorizontalMirroring_toggled"]
-[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightIndicatorCheckbox" to="." method="_on_RightIndicatorCheckbox_toggled"]
+[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons/LeftVerticalMirroring" to="." method="_on_LeftVerticalMirroring_toggled"]
-[connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushType/RightBrushTypeButton" to="." method="_on_RightBrushTypeButton_pressed"]
+[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightIndicatorCheckbox" to="." method="_on_RightIndicatorCheckbox_toggled"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushSize/RightBrushSizeSlider" to="." method="_on_RightBrushSizeEdit_value_changed"]
+[connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushType/RightBrushTypeButton" to="." method="_on_RightBrushTypeButton_pressed"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushSize/RightBrushSizeEdit" to="." method="_on_RightBrushSizeEdit_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushSize/HBoxContainer/RightBrushSizeSlider" to="." method="_on_RightBrushSizeEdit_value_changed"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightColorInterpolation/RightInterpolateSlider" to="." method="_on_RightInterpolateFactor_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushSize/HBoxContainer/RightBrushSizeEdit" to="." method="_on_RightBrushSizeEdit_value_changed"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightColorInterpolation/RightInterpolateFactor" to="." method="_on_RightInterpolateFactor_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorInterpolation/HBoxContainer/RightInterpolateSlider" to="." method="_on_RightInterpolateFactor_value_changed"]
-[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightFillArea/RightFillAreaOptions" to="." method="_on_RightFillAreaOptions_item_selected"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorInterpolation/HBoxContainer/RightInterpolateFactor" to="." method="_on_RightInterpolateFactor_value_changed"]
-[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions/RightLightenDarken" to="." method="_on_RightLightenDarken_item_selected"]
+[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightFillArea/RightFillAreaOptions" to="." method="_on_RightFillAreaOptions_item_selected"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions/RightLDAmount/RightLDAmountSlider" to="." method="_on_RightLDAmountSpinbox_value_changed"]
+[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightLDOptions/RightLightenDarken" to="." method="_on_RightLightenDarken_item_selected"]
-[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions/RightLDAmount/RightLDAmountSpinbox" to="." method="_on_RightLDAmountSpinbox_value_changed"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightLDOptions/RightLDAmount/RightLDAmountSlider" to="." method="_on_RightLDAmountSpinbox_value_changed"]
-[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons/RightHorizontalMirroring" to="." method="_on_RightHorizontalMirroring_toggled"]
+[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightLDOptions/RightLDAmount/RightLDAmountSpinbox" to="." method="_on_RightLDAmountSpinbox_value_changed"]
-[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons/RightVerticalMirroring" to="." method="_on_RightVerticalMirroring_toggled"]
+[connection signal="item_selected" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightColorPickerOptions/RightForColorOptions" to="." method="_on_RightForColorOptions_item_selected"]
+[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons/RightHorizontalMirroring" to="." method="_on_RightHorizontalMirroring_toggled"]
+[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons/RightVerticalMirroring" to="." method="_on_RightVerticalMirroring_toggled"]
 [connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" to="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_pressed"]
 [connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" to="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" method="_on_VerticalRuler_pressed"]
 [connection signal="mouse_entered" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" to="." method="_on_ViewportContainer_mouse_entered"]

Scripts/Canvas.gd

@@ -107,6 +107,7 @@ func _input(event : InputEvent) -> void:
 	# For the LightenDarken tool
 	var ld := 0
 	var ld_amount := 0.1
+	var color_picker_for := 0
 
 	west_limit = location.x
 	east_limit = location.x + size.x
@@ -125,6 +126,7 @@ func _input(event : InputEvent) -> void:
 		fill_area = Global.left_fill_area
 		ld = Global.left_ld
 		ld_amount = Global.left_ld_amount
+		color_picker_for = Global.left_color_picker_for
 	elif Input.is_mouse_button_pressed(BUTTON_RIGHT):
 		current_mouse_button = "right_mouse"
 		current_action = Global.current_right_tool
@@ -132,6 +134,7 @@ func _input(event : InputEvent) -> void:
 		fill_area = Global.right_fill_area
 		ld = Global.right_ld
 		ld_amount = Global.right_ld_amount
+		color_picker_for = Global.right_color_picker_for
 
 	if Global.current_frame == frame:
 		if mouse_in_canvas && Global.has_focus:
@@ -251,10 +254,10 @@ func _input(event : InputEvent) -> void:
 		"ColorPicker":
 			if can_handle && Global.current_frame == frame:
 				var pixel_color : Color = layers[current_layer_index][0].get_pixelv(mouse_pos)
-				if current_mouse_button == "left_mouse":
+				if color_picker_for == 0: # Pick for the left color
 					Global.left_color_picker.color = pixel_color
 					Global.update_left_custom_brush()
-				elif current_mouse_button == "right_mouse":
+				elif color_picker_for == 1: # Pick for the left color
 					Global.right_color_picker.color = pixel_color
 					Global.update_right_custom_brush()
 

Scripts/Global.gd

@@ -57,6 +57,12 @@ var left_ld_amount := 0.1
 # warning-ignore:unused_class_variable
 var right_ld_amount := 0.1
 
+# 0 for the left, 1 for the right
+# warning-ignore:unused_class_variable
+var left_color_picker_for := 0
+# warning-ignore:unused_class_variable
+var right_color_picker_for := 1
+
 # warning-ignore:unused_class_variable
 var left_horizontal_mirror := false
 # warning-ignore:unused_class_variable
@@ -185,6 +191,9 @@ var right_ld_container : Container
 var right_ld_amount_slider : HSlider
 var right_ld_amount_spinbox : SpinBox
 
+var left_colorpicker_container : Container
+var right_colorpicker_container : Container
+
 var left_mirror_container : Container
 var right_mirror_container : Container
 
@@ -297,6 +306,9 @@ func _ready() -> void:
 	right_ld_amount_slider = find_node_by_name(right_ld_container, "RightLDAmountSlider")
 	right_ld_amount_spinbox = find_node_by_name(right_ld_container, "RightLDAmountSpinbox")
 
+	left_colorpicker_container = find_node_by_name(left_tool_options_container, "LeftColorPickerOptions")
+	right_colorpicker_container = find_node_by_name(right_tool_options_container, "RightColorPickerOptions")
+
 	left_mirror_container = find_node_by_name(left_tool_options_container, "LeftMirroring")
 	right_mirror_container = find_node_by_name(right_tool_options_container, "RightMirroring")
 

Scripts/Main.gd

@@ -572,6 +572,8 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
 			Global.left_brush_size_container.visible = true
 			Global.left_ld_container.visible = true
 			Global.left_mirror_container.visible = true
+		elif current_action == "ColorPicker":
+			Global.left_colorpicker_container.visible = true
 
 	elif (mouse_press && Input.is_action_just_released("right_mouse")) || (!mouse_press && !key_for_left):
 		Global.current_right_tool = current_action
@@ -597,6 +599,8 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
 			Global.right_brush_size_container.visible = true
 			Global.right_ld_container.visible = true
 			Global.right_mirror_container.visible = true
+		elif current_action == "ColorPicker":
+			Global.right_colorpicker_container.visible = true
 
 	for t in tools:
 		var tool_name : String = t[0].name
@@ -925,6 +929,12 @@ func _on_RightLDAmountSpinbox_value_changed(value : float) -> void:
 	Global.right_ld_amount_slider.value = value
 	Global.right_ld_amount_spinbox.value = value
 
+func _on_LeftForColorOptions_item_selected(ID : int) -> void:
+	Global.left_color_picker_for = ID
+
+func _on_RightForColorOptions_item_selected(ID : int) -> void:
+	Global.right_color_picker_for = ID
+
 func _on_LeftHorizontalMirroring_toggled(button_pressed) -> void:
 	Global.left_horizontal_mirror = button_pressed
 func _on_LeftVerticalMirroring_toggled(button_pressed) -> void:
@@ -947,3 +957,4 @@ func _on_QuitDialog_confirmed() -> void:
 	modulate = Color(0.5, 0.5, 0.5)
 
 	get_tree().quit()
+

Translations/Translations.pot

@@ -397,6 +397,15 @@ msgstr ""
 msgid "LDAMOUNT_HT"
 msgstr ""
 
+msgid "Pick for:"
+msgstr ""
+
+msgid "Left Color"
+msgstr ""
+
+msgid "Right Color"
+msgstr ""
+
 msgid "Mirroring"
 msgstr ""
 

Translations/de.po

@@ -447,6 +447,17 @@ msgstr "Menge:"
 msgid "LDAMOUNT_HT"
 msgstr "Erhellen/Verdunkeln Menge"
 
+msgid "Pick for:"
+msgstr ""
+
+#, fuzzy
+msgid "Left Color"
+msgstr "Farbe:"
+
+#, fuzzy
+msgid "Right Color"
+msgstr "Rechte Werkzeugoptionen"
+
 msgid "Mirroring"
 msgstr "Spiegeln"
 

Translations/el.po

@@ -446,6 +446,15 @@ msgstr "Ποσό:"
 msgid "LDAMOUNT_HT"
 msgstr "Ποσό φωτίσματος ή σκουρήματος"
 
+msgid "Pick for:"
+msgstr "Επιλογή για το:"
+
+msgid "Left Color"
+msgstr "Αριστερό Χρώμα"
+
+msgid "Right Color"
+msgstr "Δεξί Χρώμα"
+
 msgid "Mirroring"
 msgstr "Κατοπτρισμός"
 

Translations/en.po

@@ -438,6 +438,15 @@ msgstr "Amount:"
 msgid "LDAMOUNT_HT"
 msgstr "Lighten/Darken amount"
 
+msgid "Pick for:"
+msgstr "Pick for:"
+
+msgid "Left Color"
+msgstr "Left Color"
+
+msgid "Right Color"
+msgstr "Right Color"
+
 msgid "Mirroring"
 msgstr "Mirroring"
 

Translations/fr.po

@@ -464,6 +464,17 @@ msgstr "Quantité :"
 msgid "LDAMOUNT_HT"
 msgstr "Quantité d'éclaircissement/assombrissement"
 
+msgid "Pick for:"
+msgstr ""
+
+#, fuzzy
+msgid "Left Color"
+msgstr "Couleur :"
+
+#, fuzzy
+msgid "Right Color"
+msgstr "Options de l'outil droit"
+
 msgid "Mirroring"
 msgstr "Miroir"
 

Translations/it.po

@@ -443,6 +443,17 @@ msgstr "Quantità:"
 msgid "LDAMOUNT_HT"
 msgstr "Quantità di Schiarimento/Scurimento"
 
+msgid "Pick for:"
+msgstr ""
+
+#, fuzzy
+msgid "Left Color"
+msgstr "Colore:"
+
+#, fuzzy
+msgid "Right Color"
+msgstr "Opzioni dello strumento destro"
+
 msgid "Mirroring"
 msgstr "Speculare"
 

Translations/pl.po

@@ -453,6 +453,17 @@ msgstr "Siła:"
 msgid "LDAMOUNT_HT"
 msgstr "Siła rozjaśnienia/przyciemnienia"
 
+msgid "Pick for:"
+msgstr ""
+
+#, fuzzy
+msgid "Left Color"
+msgstr "Kolor:"
+
+#, fuzzy
+msgid "Right Color"
+msgstr "Opcje prawego narzędzia"
+
 msgid "Mirroring"
 msgstr "Lustrzane odbicie"
 

Translations/pt_BR.po

@@ -447,6 +447,17 @@ msgstr "Quantidade:"
 msgid "LDAMOUNT_HT"
 msgstr "Quantidade de iluminação/escurecimento:"
 
+msgid "Pick for:"
+msgstr ""
+
+#, fuzzy
+msgid "Left Color"
+msgstr "Cor:"
+
+#, fuzzy
+msgid "Right Color"
+msgstr "Opções da ferramente direita"
+
 msgid "Mirroring"
 msgstr "Espelhamento"
 

Translations/ru.po

@@ -452,6 +452,17 @@ msgstr "Кол-во:"
 msgid "LDAMOUNT_HT"
 msgstr "Интенсивность Высветления/Затемнения"
 
+msgid "Pick for:"
+msgstr ""
+
+#, fuzzy
+msgid "Left Color"
+msgstr "Цвет:"
+
+#, fuzzy
+msgid "Right Color"
+msgstr "Настройки правого инструмента"
+
 msgid "Mirroring"
 msgstr "Отразить зеркально"
 

Translations/zh_TW.po

@@ -437,6 +437,17 @@ msgstr "程度:"
 msgid "LDAMOUNT_HT"
 msgstr "變亮或變暗的程度"
 
+msgid "Pick for:"
+msgstr ""
+
+#, fuzzy
+msgid "Left Color"
+msgstr "顏色:"
+
+#, fuzzy
+msgid "Right Color"
+msgstr "右鍵工具選項"
+
 msgid "Mirroring"
 msgstr "鏡像"