public_mirrors
/
material-maker
mirror of https://github.com/RodZill4/material-maker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI fixes

This commit is contained in:
RodZill4 2020-09-29 20:09:51 +02:00
parent 086190a041
commit dbebf37a1f
6 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
material_maker/main_window.tscn
View File

@ -82,6 +82,7 @@ margin_right = 1268.0
margin_top = 26.0
margin_right = 1268.0
margin_bottom = 708.0
grow_horizontal = 0
size_flags_vertical = 3
split_offset = -1118
script = ExtResource( 2 )
@ -114,27 +115,27 @@ margin_right = 1268.0
margin_bottom = 682.0
split_offset = 133
[node name="ProjectsPane" type="Control" parent="VBoxContainer/Layout/SplitRight"]
[node name="ProjectsPanel" type="Control" parent="VBoxContainer/Layout/SplitRight"]
margin_right = 981.0
margin_bottom = 682.0
size_flags_horizontal = 3
size_flags_vertical = 3
size_flags_stretch_ratio = 3.0
[node name="Preview2D" parent="VBoxContainer/Layout/SplitRight/ProjectsPane" instance=ExtResource( 3 )]
[node name="Preview2D" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel" instance=ExtResource( 3 )]
visible = false
material = SubResource( 2 )
margin_right = 0.0
margin_bottom = 0.0
[node name="Preview3D" parent="VBoxContainer/Layout/SplitRight/ProjectsPane" instance=ExtResource( 4 )]
[node name="Preview3D" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel" instance=ExtResource( 4 )]
margin_left = 0.0
margin_top = 0.0
margin_right = 0.0
margin_bottom = 0.0
ui_path = "../PreviewUI/Panel/HBoxContainer/Preview3DUI"
[node name="Projects" type="Panel" parent="VBoxContainer/Layout/SplitRight/ProjectsPane"]
[node name="Projects" type="Panel" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel"]
self_modulate = Color( 1, 1, 1, 0 )
anchor_right = 1.0
anchor_bottom = 1.0
@ -147,7 +148,7 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Tabs" type="Tabs" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects"]
[node name="Tabs" type="Tabs" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects"]
margin_right = 950.0
margin_bottom = 24.0
tab_align = 0
@ -156,9 +157,9 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="AddNodePopup" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects" instance=ExtResource( 7 )]
[node name="AddNodePopup" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects" instance=ExtResource( 7 )]
[node name="PreviewUI" type="HBoxContainer" parent="VBoxContainer/Layout/SplitRight/ProjectsPane"]
[node name="PreviewUI" type="HBoxContainer" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel"]
anchor_top = 1.0
anchor_bottom = 1.0
margin_left = 1.0
@ -170,14 +171,14 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Preview2DButton" type="Button" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI"]
[node name="Preview2DButton" type="Button" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI"]
margin_right = 44.0
margin_bottom = 40.0
hint_tooltip = "Show 2D preview"
toggle_mode = true
icon = SubResource( 3 )
[node name="Preview3DButton" type="Button" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI"]
[node name="Preview3DButton" type="Button" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI"]
margin_left = 51.0
margin_right = 95.0
margin_bottom = 40.0
@ -185,13 +186,13 @@ hint_tooltip = "Show 3D preview"
toggle_mode = true
icon = SubResource( 4 )
[node name="Panel" type="PanelContainer" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI"]
[node name="Panel" type="PanelContainer" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI"]
visible = false
margin_left = 102.0
margin_right = 336.0
margin_bottom = 40.0
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI/Panel"]
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI/Panel"]
margin_left = 4.0
margin_top = 4.0
margin_right = 230.0
@ -201,17 +202,17 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="SpaceLeft" type="Control" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI/Panel/HBoxContainer"]
[node name="SpaceLeft" type="Control" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI/Panel/HBoxContainer"]
margin_bottom = 32.0
[node name="ControlView" type="TextureRect" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI/Panel/HBoxContainer"]
[node name="ControlView" type="TextureRect" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI/Panel/HBoxContainer"]
margin_left = 5.0
margin_right = 37.0
margin_bottom = 31.0
size_flags_vertical = 4
texture = SubResource( 5 )
[node name="Preview3DUI" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI/Panel/HBoxContainer" instance=ExtResource( 5 )]
[node name="Preview3DUI" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI/Panel/HBoxContainer" instance=ExtResource( 5 )]
anchor_right = 0.0
margin_left = 42.0
margin_top = 4.0
@ -219,7 +220,7 @@ margin_right = 221.0
margin_bottom = 28.0
size_flags_vertical = 4
[node name="SpaceRight" type="Control" parent="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI/Panel/HBoxContainer"]
[node name="SpaceRight" type="Control" parent="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI/Panel/HBoxContainer"]
margin_left = 226.0
margin_right = 226.0
margin_bottom = 32.0
@ -250,18 +251,19 @@ use_hidden_tabs_for_min_size = true
[node name="NodeFactory" type="Node" parent="."]
script = ExtResource( 9 )
[connection signal="dragged" from="VBoxContainer/Layout" to="VBoxContainer/Layout" method="_on_Left_dragged"]
[connection signal="resized" from="VBoxContainer/Layout" to="VBoxContainer/Layout" method="_on_Layout_resized"]
[connection signal="tab_changed" from="VBoxContainer/Layout/Left/Top" to="VBoxContainer/Layout" method="_on_tab_changed"]
[connection signal="tab_changed" from="VBoxContainer/Layout/Left/Bottom" to="VBoxContainer/Layout" method="_on_tab_changed"]
[connection signal="dragged" from="VBoxContainer/Layout/SplitRight" to="VBoxContainer/Layout" method="_on_Right_dragged"]
[connection signal="need_update" from="VBoxContainer/Layout/SplitRight/ProjectsPane/Preview3D" to="." method="update_preview_3d"]
[connection signal="no_more_tabs" from="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects" to="." method="new_material"]
[connection signal="resized" from="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects" to="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects" method="_on_Projects_resized"]
[connection signal="tab_changed" from="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects" to="." method="_on_Projects_tab_changed"]
[connection signal="reposition_active_tab_request" from="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects/Tabs" to="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects" method="move_active_tab_to"]
[connection signal="tab_changed" from="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects/Tabs" to="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects" method="set_current_tab"]
[connection signal="tab_close" from="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects/Tabs" to="VBoxContainer/Layout/SplitRight/ProjectsPane/Projects" method="close_tab"]
[connection signal="toggled" from="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI/Preview2DButton" to="." method="show_background_preview_2d"]
[connection signal="toggled" from="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI/Preview3DButton" to="." method="show_background_preview_3d"]
[connection signal="gui_input" from="VBoxContainer/Layout/SplitRight/ProjectsPane/PreviewUI/Panel/HBoxContainer/ControlView" to="VBoxContainer/Layout/SplitRight/ProjectsPane/Preview3D" method="on_gui_input"]
[connection signal="need_update" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/Preview3D" to="." method="update_preview_3d"]
[connection signal="no_more_tabs" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects" to="." method="new_material"]
[connection signal="resized" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects" to="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects" method="_on_Projects_resized"]
[connection signal="tab_changed" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects" to="." method="_on_Projects_tab_changed"]
[connection signal="reposition_active_tab_request" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects/Tabs" to="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects" method="move_active_tab_to"]
[connection signal="tab_changed" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects/Tabs" to="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects" method="set_current_tab"]
[connection signal="tab_close" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects/Tabs" to="VBoxContainer/Layout/SplitRight/ProjectsPanel/Projects" method="close_tab"]
[connection signal="toggled" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI/Preview2DButton" to="." method="show_background_preview_2d"]
[connection signal="toggled" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI/Preview3DButton" to="." method="show_background_preview_3d"]
[connection signal="gui_input" from="VBoxContainer/Layout/SplitRight/ProjectsPanel/PreviewUI/Panel/HBoxContainer/ControlView" to="VBoxContainer/Layout/SplitRight/ProjectsPanel/Preview3D" method="on_gui_input"]
[connection signal="tab_changed" from="VBoxContainer/Layout/SplitRight/Right/Top" to="VBoxContainer/Layout" method="_on_tab_changed"]
[connection signal="tab_changed" from="VBoxContainer/Layout/SplitRight/Right/Bottom" to="VBoxContainer/Layout" method="_on_tab_changed"]

2
material_maker/nodes/ios/port.tscn
View File

@ -63,7 +63,7 @@ margin_left = 1158.0
margin_right = 1260.0
margin_bottom = 22.0
rect_min_size = Vector2( 102, 0 )
hint_tooltip = "Input flag"
hint_tooltip = "Port type"
text = "Greyscale"
[node name="PortGroupButton" parent="." instance=ExtResource( 4 )]

12
material_maker/panels/graph_edit/graph_edit.tscn
View File

@ -41,10 +41,12 @@ one_shot = true
[node name="GraphUI" type="HBoxContainer" parent="."]
anchor_left = 1.0
anchor_right = 1.0
margin_left = -262.0
margin_right = -16.0
margin_left = -294.0
margin_bottom = 24.0
alignment = 2
__meta__ = {
"_edit_use_anchors_": false
}
[node name="SubGraphUI" type="HBoxContainer" parent="GraphUI"]
margin_right = 246.0
@ -86,6 +88,12 @@ margin_bottom = 24.0
hint_tooltip = "Show hierarchy"
icon = SubResource( 4 )
[node name="Control" type="Control" parent="GraphUI"]
margin_left = 282.0
margin_right = 294.0
margin_bottom = 24.0
rect_min_size = Vector2( 12, 0 )
[node name="UndoRedo" type="Node" parent="."]
script = ExtResource( 3 )
[connection signal="connection_request" from="." to="." method="connect_node"]

3
material_maker/widgets/linked_widgets/editable_label.tscn
View File

@ -2,7 +2,6 @@
[ext_resource path="res://material_maker/widgets/linked_widgets/editable_label.gd" type="Script" id=1]
[node name="EditableLabel" type="HBoxContainer"]
margin_right = 40.0
margin_bottom = 40.0
@ -10,7 +9,7 @@ script = ExtResource( 1 )
[node name="Label" type="Label" parent="."]
margin_top = 13.0
margin_right = 62.0
margin_right = 40.0
margin_bottom = 27.0
mouse_filter = 0
size_flags_horizontal = 3

1
material_maker/windows/add_node_popup/add_node_popup.tscn
View File

@ -2,7 +2,6 @@
[ext_resource path="res://material_maker/windows/add_node_popup/add_node_popup.gd" type="Script" id=1]
[node name="AddNodePopup" type="Popup"]
margin_right = 275.0
margin_bottom = 319.0

2
material_maker/windows/desc_dialog/desc_dialog.tscn
View File

@ -3,7 +3,6 @@
[ext_resource path="res://material_maker/windows/desc_dialog/desc_dialog.gd" type="Script" id=1]
[node name="WindowDialog" type="WindowDialog"]
visible = true
margin_right = 493.0
margin_bottom = 275.0
window_title = "Parameter description"
@ -47,6 +46,7 @@ margin_right = 485.0
margin_bottom = 241.0
size_flags_horizontal = 3
size_flags_vertical = 3
wrap_enabled = true
[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 247.0