Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flip X and Flip Y, and Rotation (90, 180, 270) buttons to BaseTool #988

Merged
merged 31 commits into from
Mar 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
afacaf5
Add Flip X, Flip Y, Rotate 90, Rotate 180, Rotate 270
RorotoSic Feb 29, 2024
706222c
node placement
RorotoSic Feb 29, 2024
c7fdc9a
flip_rotate for BrushButton
RorotoSic Mar 2, 2024
10db8f8
flip corrected for BrushButton (x, y was reversed)
RorotoSic Mar 2, 2024
8bbcc21
code changed for github static checks
RorotoSic Mar 2, 2024
01664dd
github static checks
RorotoSic Mar 2, 2024
eb77d05
github static checks 2
RorotoSic Mar 2, 2024
39e3e7e
remove " _ " before my variable name
RorotoSic Mar 2, 2024
c37295e
var brush_texture_rotation
RorotoSic Mar 2, 2024
0193a92
Hide Flip/Rotate buttons where it is unnecessary
RorotoSic Mar 3, 2024
7519fd6
btns flip/rotate hide when a non-image brush is selected
RorotoSic Mar 7, 2024
1791e96
rotate ButtonGroup (radio btn)
RorotoSic Mar 7, 2024
51189ac
expand button for flip/rotate
RorotoSic Mar 7, 2024
12309c0
radio btn grp 2
RorotoSic Mar 7, 2024
3062afe
expand button (forgot to add the tscn )
RorotoSic Mar 7, 2024
c970e00
cursor shape to pointing hand
RorotoSic Mar 8, 2024
49a4da3
tooltip R90 R180 R270
RorotoSic Mar 8, 2024
76b8d2b
shading.tscn (nodes placement debreaking)
RorotoSic Mar 8, 2024
fc55f10
Revert "expand button (forgot to add the tscn )"
RorotoSic Mar 15, 2024
423885a
Revert "expand button for flip/rotate"
RorotoSic Mar 15, 2024
fd80248
Collapsible Container
RorotoSic Mar 15, 2024
b80ab1a
remove thick white outline when CollapseContainer is pressed and focus
RorotoSic Mar 15, 2024
0af0e1f
styleboxflat when CollapseContainer is pressed and empty for checkbox
RorotoSic Mar 15, 2024
24cb05a
Revert "styleboxflat when CollapseContainer is pressed and empty for …
RorotoSic Mar 16, 2024
14b3745
StyleboxEmpty for normal / keep hover unchanged
RorotoSic Mar 16, 2024
0730e8e
Merge branch 'Orama-Interactive:master' into master
RorotoSic Mar 20, 2024
c63eb40
Revert "StyleboxEmpty for normal / keep hover unchanged"
RorotoSic Mar 20, 2024
0d4afe0
Revert "remove thick white outline when CollapseContainer is pressed …
RorotoSic Mar 20, 2024
43d3c00
"flip_rotateD" + "Flat CollapsibleContainer'"
RorotoSic Mar 20, 2024
11bfaae
conflicts Resolved
RorotoSic Mar 23, 2024
a181968
Merge branch 'master' into master
OverloadedOrama Mar 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
expand button (forgot to add the tscn )
  • Loading branch information
RorotoSic committed Mar 7, 2024
commit 3062afe73f2556c4d27e55a04a4785c8c6c6f93d
24 changes: 19 additions & 5 deletions src/Tools/BaseDraw.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
[gd_scene load_steps=7 format=3 uid="uid://ubyatap3sylf"]
[gd_scene load_steps=9 format=3 uid="uid://ubyatap3sylf"]

[ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/ValueSlider.tscn" id="1"]
[ext_resource type="PackedScene" uid="uid://ctfgfelg0sho8" path="res://src/Tools/BaseTool.tscn" id="2"]
[ext_resource type="Script" path="res://src/Tools/BaseDraw.gd" id="3"]
[ext_resource type="Texture2D" uid="uid://ct8wn8m6x4m54" path="res://assets/graphics/misc/value_arrow.svg" id="3_4bfcu"]
[ext_resource type="Texture2D" uid="uid://bhkmiijflfqxx" path="res://assets/graphics/misc/value_arrow_up.svg" id="4_8a8ae"]

[sub_resource type="ButtonGroup" id="ButtonGroup_7u3x0"]
resource_name = "rotate"
Expand All @@ -29,7 +31,17 @@ anti_aliasing = false
[node name="ToolOptions" instance=ExtResource("2")]
script = ExtResource("3")

[node name="Flip" type="HBoxContainer" parent="." index="2"]
[node name="ExpandButton" type="TextureButton" parent="." index="2" groups=["UIButtons"]]
visible = false
layout_mode = 2
size_flags_horizontal = 0
mouse_default_cursor_shape = 2
toggle_mode = true
texture_normal = ExtResource("3_4bfcu")
texture_pressed = ExtResource("4_8a8ae")

[node name="Flip" type="HBoxContainer" parent="." index="3"]
visible = false
layout_mode = 2

[node name="FlipX" type="CheckBox" parent="Flip" index="0"]
Expand All @@ -40,7 +52,8 @@ text = "Flip X"
layout_mode = 2
text = "Flip Y"

[node name="Rotate" type="HBoxContainer" parent="." index="3"]
[node name="Rotate" type="HBoxContainer" parent="." index="4"]
visible = false
layout_mode = 2

[node name="Rotate90" type="CheckBox" parent="Rotate" index="0"]
Expand All @@ -58,7 +71,7 @@ layout_mode = 2
button_group = SubResource("ButtonGroup_7u3x0")
text = "R 270"

[node name="Brush" type="HBoxContainer" parent="." index="4"]
[node name="Brush" type="HBoxContainer" parent="." index="5"]
layout_mode = 2
alignment = 1

Expand Down Expand Up @@ -92,12 +105,13 @@ suffix = "px"
global_increment_action = "brush_size_increment"
global_decrement_action = "brush_size_decrement"

[node name="ColorInterpolation" parent="." index="5" instance=ExtResource("1")]
[node name="ColorInterpolation" parent="." index="6" instance=ExtResource("1")]
visible = false
layout_mode = 2
tooltip_text = "0: Color from the brush itself, 100: the currently selected color"
prefix = "Brush color from:"

[connection signal="toggled" from="ExpandButton" to="." method="_on_expand_button_toggled"]
[connection signal="toggled" from="Flip/FlipX" to="." method="_on_flip_x_toggled"]
[connection signal="toggled" from="Flip/FlipY" to="." method="_on_flip_y_toggled"]
[connection signal="toggled" from="Rotate/Rotate90" to="." method="_on_rotate_90_toggled"]
Expand Down