From 85d438a9c4c369a04132568b2dbc711ea56ccf8c Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Wed, 6 May 2020 20:24:22 +0300 Subject: [PATCH] Set the presets of CreateNewImage and FrameTagDialog color pickers to be invisible --- src/UI/Dialogs/CreateNewImage.gd | 1 + src/UI/Dialogs/CreateNewImage.tscn | 3 +-- src/UI/Dialogs/FrameTagDialog.gd | 4 ++++ src/UI/Dialogs/FrameTagDialog.tscn | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/UI/Dialogs/CreateNewImage.gd b/src/UI/Dialogs/CreateNewImage.gd index 54b7da3fd..3975ffca6 100644 --- a/src/UI/Dialogs/CreateNewImage.gd +++ b/src/UI/Dialogs/CreateNewImage.gd @@ -53,6 +53,7 @@ var TStrings ={ func _ready() -> void: + fill_color_node.get_picker().presets_visible = false ratio_box.connect("pressed", self, "_on_RatioCheckBox_toggled", [ratio_box.pressed]) templates_options.connect("item_selected", self, "_on_TemplatesOptions_item_selected") diff --git a/src/UI/Dialogs/CreateNewImage.tscn b/src/UI/Dialogs/CreateNewImage.tscn index 9003f0ae6..539f4fcfc 100644 --- a/src/UI/Dialogs/CreateNewImage.tscn +++ b/src/UI/Dialogs/CreateNewImage.tscn @@ -2,8 +2,6 @@ [ext_resource path="res://src/UI/Dialogs/CreateNewImage.gd" type="Script" id=1] - - [node name="CreateNewImage" type="ConfirmationDialog"] margin_right = 300.0 margin_bottom = 200.0 @@ -119,6 +117,7 @@ margin_top = 108.0 margin_right = 189.0 margin_bottom = 128.0 rect_min_size = Vector2( 64, 20 ) +mouse_default_cursor_shape = 2 color = Color( 0, 0, 0, 0 ) [connection signal="about_to_show" from="." to="." method="_on_CreateNewImage_about_to_show"] [connection signal="confirmed" from="." to="." method="_on_CreateNewImage_confirmed"] diff --git a/src/UI/Dialogs/FrameTagDialog.gd b/src/UI/Dialogs/FrameTagDialog.gd index d7bacffa9..3fc7ca04f 100644 --- a/src/UI/Dialogs/FrameTagDialog.gd +++ b/src/UI/Dialogs/FrameTagDialog.gd @@ -10,6 +10,10 @@ onready var add_tag_button : TextureButton = $VBoxContainer/ScrollContainer/VBox onready var options_dialog = $TagOptions +func _ready() -> void: + $"TagOptions/GridContainer/ColorPickerButton".get_picker().presets_visible = false + + func _on_FrameTagDialog_about_to_show() -> void: Global.can_draw = false for vbox in tag_vboxes: diff --git a/src/UI/Dialogs/FrameTagDialog.tscn b/src/UI/Dialogs/FrameTagDialog.tscn index 6f8d03af0..1531bb738 100644 --- a/src/UI/Dialogs/FrameTagDialog.tscn +++ b/src/UI/Dialogs/FrameTagDialog.tscn @@ -3,8 +3,6 @@ [ext_resource path="res://src/UI/Dialogs/FrameTagDialog.gd" type="Script" id=1] [ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=2] - - [node name="FrameTagDialog" type="AcceptDialog"] margin_right = 83.0 margin_bottom = 58.0