diff --git a/Translations/Translations.pot b/Translations/Translations.pot index ff612e5a8..719ef0d12 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -500,6 +500,15 @@ msgstr "" msgid "Icon color:" msgstr "" +msgid "Tool button size:" +msgstr "" + +msgid "Small" +msgstr "" + +msgid "Big" +msgstr "" + msgid "Only affect selection" msgstr "" diff --git a/assets/graphics/tool_backgrounds/l.png b/assets/graphics/tool_backgrounds/l.png deleted file mode 100644 index c577393f0..000000000 Binary files a/assets/graphics/tool_backgrounds/l.png and /dev/null differ diff --git a/assets/graphics/tool_backgrounds/l.png.import b/assets/graphics/tool_backgrounds/l.png.import deleted file mode 100644 index 9af648c9d..000000000 --- a/assets/graphics/tool_backgrounds/l.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/l.png-3f857659046abe0edc43ba56844cdd8a.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/graphics/tool_backgrounds/l.png" -dest_files=[ "res://.import/l.png-3f857659046abe0edc43ba56844cdd8a.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/tool_backgrounds/l_r.png b/assets/graphics/tool_backgrounds/l_r.png deleted file mode 100644 index 33d1de0ff..000000000 Binary files a/assets/graphics/tool_backgrounds/l_r.png and /dev/null differ diff --git a/assets/graphics/tool_backgrounds/l_r.png.import b/assets/graphics/tool_backgrounds/l_r.png.import deleted file mode 100644 index 825c360f2..000000000 --- a/assets/graphics/tool_backgrounds/l_r.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/l_r.png-542460b9c6fb257be91af1f344bd44df.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/graphics/tool_backgrounds/l_r.png" -dest_files=[ "res://.import/l_r.png-542460b9c6fb257be91af1f344bd44df.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/tool_backgrounds/r.png b/assets/graphics/tool_backgrounds/r.png deleted file mode 100644 index 7743c20c5..000000000 Binary files a/assets/graphics/tool_backgrounds/r.png and /dev/null differ diff --git a/assets/graphics/tools/tool_background.png b/assets/graphics/tools/tool_background.png new file mode 100644 index 000000000..534a3e650 Binary files /dev/null and b/assets/graphics/tools/tool_background.png differ diff --git a/assets/graphics/tool_backgrounds/r.png.import b/assets/graphics/tools/tool_background.png.import similarity index 64% rename from assets/graphics/tool_backgrounds/r.png.import rename to assets/graphics/tools/tool_background.png.import index b0f36c8e5..5ef542e65 100644 --- a/assets/graphics/tool_backgrounds/r.png.import +++ b/assets/graphics/tools/tool_background.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r.png-5ffbbabe25e0d2f427ffcc0f92ebdb06.stex" +path="res://.import/tool_background.png-6ff92c662de40dca94545bb57f5c1e8e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/tool_backgrounds/r.png" -dest_files=[ "res://.import/r.png-5ffbbabe25e0d2f427ffcc0f92ebdb06.stex" ] +source_file="res://assets/graphics/tools/tool_background.png" +dest_files=[ "res://.import/tool_background.png-6ff92c662de40dca94545bb57f5c1e8e.stex" ] [params] @@ -30,5 +30,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index 4773b77b5..6e2c8ab51 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -8,6 +8,8 @@ enum ThemeTypes {DARK, BLUE, CARAMEL, LIGHT} enum TileMode {NONE, BOTH, X_AXIS, Y_AXIS} enum PanelLayout {AUTO, WIDESCREEN, TALLSCREEN} enum IconColorFrom {THEME, CUSTOM} +enum ButtonSize {SMALL, BIG} + # Stuff for arrowkey-based canvas movements nyaa ^.^ const low_speed_move_rate := 150.0 const medium_speed_move_rate := 750.0 @@ -56,6 +58,7 @@ var theme_type : int = ThemeTypes.DARK var modulate_icon_color := Color.gray var icon_color_from : int = IconColorFrom.THEME var custom_icon_color := Color.gray +var tool_button_size : int = ButtonSize.SMALL var default_image_width := 64 var default_image_height := 64 diff --git a/src/Autoload/Tools.gd b/src/Autoload/Tools.gd index c4690b8d7..cdee18e72 100644 --- a/src/Autoload/Tools.gd +++ b/src/Autoload/Tools.gd @@ -68,18 +68,14 @@ var control := false var shift := false var alt := false -onready var left_tool_background := preload("res://assets/graphics/tool_backgrounds/l.png") -onready var right_tool_background := preload("res://assets/graphics/tool_backgrounds/r.png") -onready var left_right_tool_background := preload("res://assets/graphics/tool_backgrounds/l_r.png") - func _ready() -> void: + _tool_buttons = Global.find_node_by_name(Global.control, "ToolButtons") yield(get_tree(), "idle_frame") _slots[BUTTON_LEFT] = Slot.new("Left tool") _slots[BUTTON_RIGHT] = Slot.new("Right tool") _panels[BUTTON_LEFT] = Global.find_node_by_name(Global.control, "LeftPanelContainer") _panels[BUTTON_RIGHT] = Global.find_node_by_name(Global.control, "RightPanelContainer") - _tool_buttons = Global.find_node_by_name(Global.control, "ToolButtons") var value = Global.config_cache.get_value(_slots[BUTTON_LEFT].kname, "tool", "Pencil") if not value in _tools: @@ -152,17 +148,32 @@ func get_assigned_color(button : int) -> Color: return _slots[button].color +func set_button_size(button_size : int) -> void: + if button_size == Global.ButtonSize.SMALL: + for t in _tool_buttons.get_children(): + t.rect_min_size = Vector2(24, 24) + t.get_node("ToolIcon").rect_position = Vector2.ONE + t.get_node("BackgroundLeft").rect_size.x = 12 + t.get_node("BackgroundRight").rect_size.x = 12 + t.get_node("BackgroundRight").rect_position = Vector2(24, 24) + else: + for t in _tool_buttons.get_children(): + t.rect_min_size = Vector2(32, 32) + t.get_node("ToolIcon").rect_position = Vector2.ONE * 5 + t.get_node("BackgroundLeft").rect_size.x = 16 + t.get_node("BackgroundRight").rect_size.x = 16 + t.get_node("BackgroundRight").rect_position = Vector2(32, 32) + + # It doesn't actually set the size to zero, it just resets it + _tool_buttons.get_parent().rect_size = Vector2.ZERO + + func update_tool_buttons() -> void: for child in _tool_buttons.get_children(): - var texture : TextureRect = child.get_node("Background") - if _slots[BUTTON_LEFT].tool_node.name == child.name: - texture.texture = left_tool_background - if _slots[BUTTON_RIGHT].tool_node.name == child.name: - texture.texture = left_right_tool_background - elif _slots[BUTTON_RIGHT].tool_node.name == child.name: - texture.texture = right_tool_background - else: - texture.texture = null + var left_background : NinePatchRect = child.get_node("BackgroundLeft") + var right_background : NinePatchRect = child.get_node("BackgroundRight") + left_background.visible = _slots[BUTTON_LEFT].tool_node.name == child.name + right_background.visible = _slots[BUTTON_RIGHT].tool_node.name == child.name func update_tool_cursors() -> void: diff --git a/src/Preferences/PreferencesDialog.gd b/src/Preferences/PreferencesDialog.gd index 05af74c2d..78307c785 100644 --- a/src/Preferences/PreferencesDialog.gd +++ b/src/Preferences/PreferencesDialog.gd @@ -8,6 +8,7 @@ var preferences = [ ["dim_on_popup", "Interface/DimPopup/CheckBox", "pressed", Global.dim_on_popup], ["icon_color_from", "Interface/IconColorFrom/IconColorOptionButton", "selected", Global.icon_color_from], ["custom_icon_color", "Interface/IconColorFrom/IconColorButton", "color", Global.custom_icon_color], + ["tool_button_size", "Interface/ToolButtonSize/ToolButtonSizeOptionButton", "selected", Global.tool_button_size], ["pressure_sensitivity_mode", "Startup/PressureSentivity/PressureSensitivityOptionButton", "selected", Global.pressure_sensitivity_mode], ["show_left_tool_icon", "Indicators/IndicatorsContainer/LeftToolIconCheckbox", "pressed", Global.show_left_tool_icon], @@ -172,6 +173,10 @@ func preference_update(prop : String) -> void: Global.modulate_icon_color = Global.custom_icon_color themes.change_icon_colors() + + if prop == "tool_button_size": + Tools.set_button_size(Global.tool_button_size) + Global.config_cache.save("user://cache.ini") diff --git a/src/Preferences/PreferencesDialog.tscn b/src/Preferences/PreferencesDialog.tscn index 0b2a43a0b..653e4ed7f 100644 --- a/src/Preferences/PreferencesDialog.tscn +++ b/src/Preferences/PreferencesDialog.tscn @@ -115,7 +115,7 @@ text = "System Language" visible = false margin_top = 28.0 margin_right = 498.0 -margin_bottom = 134.0 +margin_bottom = 198.0 [node name="ShrinkContainer" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] margin_right = 498.0 @@ -208,14 +208,14 @@ margin_bottom = 4.0 custom_constants/separation = 12 [node name="HSeparator2" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] -margin_top = 52.0 -margin_right = 498.0 -margin_bottom = 56.0 - -[node name="IconColorFrom" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] margin_top = 86.0 margin_right = 498.0 -margin_bottom = 106.0 +margin_bottom = 90.0 + +[node name="IconColorFrom" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] +margin_top = 94.0 +margin_right = 498.0 +margin_bottom = 138.0 columns = 3 [node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/IconColorFrom"] @@ -234,9 +234,10 @@ items = [ "Theme", null, false, 0, null, "Custom", null, false, 1, null ] selected = 0 [node name="Label2" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/IconColorFrom"] -margin_top = -83.0 -margin_right = 102.0 -margin_bottom = -69.0 +margin_left = 183.0 +margin_top = 3.0 +margin_right = 251.0 +margin_bottom = 17.0 text = "Icon color:" [node name="IconColorButton" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/IconColorFrom"] @@ -248,6 +249,32 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 color = Color( 0.75, 0.75, 0.75, 1 ) +[node name="HSeparator3" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] +margin_top = 142.0 +margin_right = 498.0 +margin_bottom = 146.0 + +[node name="ToolButtonSize" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] +margin_top = 150.0 +margin_right = 498.0 +margin_bottom = 170.0 +columns = 3 + +[node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ToolButtonSize"] +margin_top = 3.0 +margin_right = 107.0 +margin_bottom = 17.0 +text = "Tool button size:" + +[node name="ToolButtonSizeOptionButton" type="OptionButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ToolButtonSize"] +margin_left = 111.0 +margin_right = 175.0 +margin_bottom = 20.0 +mouse_default_cursor_shape = 2 +text = "Small" +items = [ "Small", null, false, 0, null, "Big", null, false, 1, null ] +selected = 0 + [node name="Canvas" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] visible = false margin_top = 28.0 diff --git a/src/UI/ToolButtons.gd b/src/UI/ToolButtons.gd index f65c82636..6a26431f2 100644 --- a/src/UI/ToolButtons.gd +++ b/src/UI/ToolButtons.gd @@ -53,3 +53,6 @@ func _on_Tool_pressed(tool_pressed : BaseButton) -> void: func _on_ToolsAndCanvas_dragged(_offset : int) -> void: var tool_panel_size : Vector2 = get_parent().get_parent().rect_size columns = clamp(tool_panel_size.x / 40, 1, 8) + + # It doesn't actually set the size to zero, it just resets it + get_parent().rect_size = Vector2.ZERO diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index b5df01e5c..c05b69124 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=37 format=2] +[gd_scene load_steps=36 format=2] [ext_resource path="res://src/UI/ToolButtons.gd" type="Script" id=1] [ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=2] @@ -13,7 +13,6 @@ [ext_resource path="res://assets/graphics/tools/shading.png" type="Texture" id=11] [ext_resource path="res://assets/graphics/tools/linetool.png" type="Texture" id=12] [ext_resource path="res://assets/graphics/tools/rectangletool.png" type="Texture" id=13] -[ext_resource path="res://assets/graphics/tool_backgrounds/l.png" type="Texture" id=14] [ext_resource path="res://assets/graphics/tools/ellipseselect.png" type="Texture" id=15] [ext_resource path="res://src/UI/CanvasPreviewContainer.tscn" type="PackedScene" id=16] [ext_resource path="res://src/UI/ColorAndToolOptions.tscn" type="PackedScene" id=17] @@ -26,13 +25,13 @@ [ext_resource path="res://assets/graphics/tools/pencil.png" type="Texture" id=24] [ext_resource path="res://assets/graphics/tools/bucket.png" type="Texture" id=25] [ext_resource path="res://assets/graphics/tools/ellipsetool.png" type="Texture" id=26] -[ext_resource path="res://assets/graphics/tool_backgrounds/r.png" type="Texture" id=27] [ext_resource path="res://assets/graphics/tools/move.png" type="Texture" id=28] [ext_resource path="res://assets/graphics/tools/rectselect.png" type="Texture" id=29] [ext_resource path="res://assets/graphics/tools/polygonselect.png" type="Texture" id=30] [ext_resource path="res://assets/graphics/tools/zoom.png" type="Texture" id=31] [ext_resource path="res://assets/graphics/tools/eraser.png" type="Texture" id=32] [ext_resource path="res://assets/graphics/tools/magicwand.png" type="Texture" id=33] +[ext_resource path="res://assets/graphics/tools/tool_background.png" type="Texture" id=34] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 9 ) @@ -111,9 +110,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectSelect"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectSelect"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectSelect"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -138,9 +164,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseSelect"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseSelect"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseSelect"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -165,9 +218,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/PolygonSelect"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/PolygonSelect"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/PolygonSelect"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -192,9 +272,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorSelect"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorSelect"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorSelect"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -219,9 +326,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/MagicWand"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/MagicWand"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/MagicWand"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -246,9 +380,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Lasso"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Lasso"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Lasso"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -273,9 +434,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Move"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Move"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Move"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -300,9 +488,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Zoom"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Zoom"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Zoom"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -327,9 +542,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pan"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pan"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pan"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -354,9 +596,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorPicker"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorPicker"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/ColorPicker"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -381,10 +650,35 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pencil"] -margin_right = 32.0 -margin_bottom = 32.0 -texture = ExtResource( 14 ) +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pencil"] +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Pencil"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -409,10 +703,35 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Eraser"] -margin_right = 32.0 -margin_bottom = 32.0 -texture = ExtResource( 27 ) +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Eraser"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Eraser"] +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -437,9 +756,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Bucket"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Bucket"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Bucket"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -464,9 +810,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Shading"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Shading"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Shading"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -491,9 +864,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LineTool"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LineTool"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LineTool"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -518,9 +918,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectangleTool"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectangleTool"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/RectangleTool"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false } @@ -545,9 +972,36 @@ rect_min_size = Vector2( 24, 24 ) mouse_default_cursor_shape = 2 button_mask = 3 -[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseTool"] -margin_right = 32.0 -margin_bottom = 32.0 +[node name="BackgroundLeft" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseTool"] +visible = false +modulate = Color( 0, 0.52549, 0.811765, 1 ) +anchor_bottom = 1.0 +margin_right = 12.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BackgroundRight" type="NinePatchRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/EllipseTool"] +visible = false +modulate = Color( 0.992157, 0.427451, 0.0784314, 1 ) +anchor_bottom = 1.0 +margin_left = 24.0 +margin_top = 24.0 +margin_right = 36.0 +margin_bottom = 24.0 +rect_rotation = 180.0 +texture = ExtResource( 34 ) +region_rect = Rect2( 0, 0, 11, 24 ) +patch_margin_left = 2 +patch_margin_top = 1 +patch_margin_right = 10 +patch_margin_bottom = 1 __meta__ = { "_edit_use_anchors_": false }