1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00

Put a ScrollContainer in the tool bar

This commit is contained in:
Manolis Papadeas 2022-02-01 00:54:33 +02:00
parent c7649bc061
commit cbae8bdc77
4 changed files with 13 additions and 15 deletions

View file

@ -123,7 +123,7 @@ onready var vertical_ruler: BaseButton = control.find_node("VerticalRuler")
onready var transparent_checker: ColorRect = control.find_node("TransparentChecker")
onready var preview_zoom_slider: VSlider = control.find_node("PreviewZoomSlider")
onready var tool_panel: Panel = control.find_node("Tools")
onready var tool_panel: ScrollContainer = control.find_node("Tools")
onready var color_pickers: Container = control.find_node("Color Pickers")
onready var left_tool_options_scroll: ScrollContainer = control.find_node("Left Tool Options")
onready var right_tool_options_scroll: ScrollContainer = control.find_node("Right Tool Options")

View file

@ -74,6 +74,3 @@ func _on_Tools_resized() -> void:
columns = tool_panel_size.x / 28.5
else:
columns = tool_panel_size.x / 36.5
# It doesn't actually set the size to zero, it just resets it
get_parent().rect_size = Vector2.ZERO

View file

@ -20,22 +20,19 @@
[ext_resource path="res://assets/graphics/tools/zoom.png" type="Texture" id=18]
[ext_resource path="res://assets/graphics/tools/tool_background.png" type="Texture" id=19]
[node name="Tools" type="Panel"]
margin_left = 4.0
margin_top = 8.0
margin_right = 46.0
margin_bottom = 716.0
rect_min_size = Vector2( 42, 32 )
rect_clip_content = true
[node name="Tools" type="ScrollContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
rect_min_size = Vector2( 42, 0 )
size_flags_horizontal = 0
size_flags_vertical = 0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="PanelContainer" type="PanelContainer" parent="."]
margin_left = 9.0
margin_top = 5.0
margin_right = 47.0
margin_bottom = 491.0
margin_right = 38.0
margin_bottom = 486.0
size_flags_horizontal = 0
size_flags_vertical = 0
__meta__ = {

View file

@ -187,6 +187,10 @@ tabs_visible = false
layout = SubResource( 25 )
[node name="Tools" parent="DockableContainer" instance=ExtResource( 1 )]
margin_left = 4.0
margin_top = 8.0
margin_right = -1234.0
margin_bottom = -4.0
[node name="Main Canvas" type="VBoxContainer" parent="DockableContainer"]
margin_left = 66.0