code: window is now correctly resizing

This commit is contained in:
Solene Rapenne 2022-05-05 21:07:06 +02:00
parent b8c97a86a4
commit 686c44ef9a
2 changed files with 59 additions and 40 deletions

View File

@ -1,4 +1,4 @@
extends Node2D extends Control
var data var data
var gui_program var gui_program
@ -11,7 +11,7 @@ var output = []
var root_tree var root_tree
onready var Tree = $Panel/Tree onready var Tree = $Panel/Tree
onready var ConsoleDisplay = $Panel/Panel/RichTextLabel onready var ConsoleDisplay = $ConsolePanel/RichTextLabel
func get_installed_packages(): func get_installed_packages():
var buffer = [] var buffer = []
@ -43,12 +43,12 @@ func _on_Button_pressed():
ConsoleDisplay.text += "- " + l + "\n" ConsoleDisplay.text += "- " + l + "\n"
if packages_to_delete.size() > 0 or packages.size() > 0: if packages_to_delete.size() > 0 or packages.size() > 0:
ConsoleDisplay.text += "\n\nClick on Accept to apply changes" ConsoleDisplay.text += "\n\nClick on Accept to apply changes"
$Panel/Panel/Accept.visible = true $ConsolePanel/Accept.visible = true
else: else:
ConsoleDisplay.text = "No change to make" ConsoleDisplay.text = "No change to make"
$Panel/Panel/Accept.visible = false $ConsolePanel/Accept.visible = false
$Panel/Panel/Cancel.visible = true $ConsolePanel/Cancel.visible = true
$Panel/Panel.visible = true $ConsolePanel.visible = true
func _on_Tree_multi_selected(): func _on_Tree_multi_selected():
var item = Tree.get_selected() var item = Tree.get_selected()
@ -122,16 +122,16 @@ func _on_LineEdit_text_entered(text):
root.set_custom_bg_color(0, Color(0.7, 0.7,0.2,0.5)) root.set_custom_bg_color(0, Color(0.7, 0.7,0.2,0.5))
func reset_display(): func reset_display():
$Panel/Panel.hide() $ConsolePanel.hide()
$Panel/Panel/Accept.hide() $ConsolePanel/Accept.hide()
packages = [] packages = []
packages_to_delete = [] packages_to_delete = []
get_installed_packages() get_installed_packages()
_on_LineEdit_text_entered($Panel/LineEdit.text) _on_LineEdit_text_entered($Panel/LineEdit.text)
func _on_Accept_pressed(): func _on_Accept_pressed():
$Panel/Panel/Accept.visible = false $ConsolePanel/Accept.visible = false
$Panel/Panel/Cancel.visible = false $ConsolePanel/Cancel.visible = false
ConsoleDisplay.text = "" ConsoleDisplay.text = ""
if packages_to_delete.size() > 0: if packages_to_delete.size() > 0:
OS.execute("xterm", ["-e", "doas", "pkg_delete", "-Ivx"] + packages_to_delete, true, output, true) OS.execute("xterm", ["-e", "doas", "pkg_delete", "-Ivx"] + packages_to_delete, true, output, true)
@ -140,5 +140,9 @@ func _on_Accept_pressed():
reset_display() reset_display()
func _on_Cancel_pressed(): func _on_Cancel_pressed():
$Panel/Panel.visible = false $ConsolePanel.visible = false
$Panel/Panel/Cancel.visible = false $ConsolePanel/Cancel.visible = false
func _on_Control_resized():
if Tree:
Tree.rect_size = self.rect_size

View File

@ -5,42 +5,62 @@
[sub_resource type="StyleBoxFlat" id=1] [sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0, 0, 0, 1 ) bg_color = Color( 0, 0, 0, 1 )
[node name="Node2D" type="Node2D"] [node name="Control" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="Panel" type="Panel" parent="."] [node name="Panel" type="Panel" parent="."]
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="LineEdit" type="LineEdit" parent="Panel"] [node name="LineEdit" type="LineEdit" parent="Panel"]
margin_left = 400.0 margin_left = 293.0
margin_top = 5.0 margin_top = 7.0
margin_right = 600.0 margin_right = 484.0
margin_bottom = 29.0 margin_bottom = 47.0
caret_blink = true
caret_blink_speed = 0.5
[node name="Tree" type="Tree" parent="Panel"] [node name="Tree" type="Tree" parent="Panel"]
margin_top = 30.0 margin_top = 55.0
margin_right = 1022.0 margin_right = 1024.0
margin_bottom = 596.0 margin_bottom = 600.0
rect_min_size = Vector2( 400, 400 )
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
size_flags_horizontal = 3
size_flags_vertical = 3
columns = 2 columns = 2
allow_reselect = true allow_reselect = true
allow_rmb_select = true allow_rmb_select = true
[node name="Button" type="Button" parent="Panel"] [node name="Button" type="Button" parent="Panel"]
margin_left = 5.0 margin_left = 63.0
margin_top = 5.0 margin_top = 7.0
margin_right = 69.0 margin_right = 245.0
margin_bottom = 25.0 margin_bottom = 47.0
text = "APPLY CHANGES" text = "APPLY CHANGES"
[node name="Panel" type="Panel" parent="Panel"] [node name="Search_Descr" type="CheckButton" parent="Panel"]
margin_left = 527.0
margin_top = 7.0
margin_right = 709.0
margin_bottom = 47.0
text = "Include description to search"
[node name="ConsolePanel" type="Panel" parent="."]
visible = false visible = false
margin_left = 200.0 anchor_right = 1.0
margin_top = 150.0 anchor_bottom = 1.0
margin_right = 800.0 margin_left = 63.0
margin_bottom = 550.0 margin_top = 75.0
margin_right = -104.0
margin_bottom = -66.0
custom_styles/panel = SubResource( 1 ) custom_styles/panel = SubResource( 1 )
[node name="RichTextLabel" type="RichTextLabel" parent="Panel/Panel"] [node name="RichTextLabel" type="RichTextLabel" parent="ConsolePanel"]
margin_left = 5.0 margin_left = 5.0
margin_top = 5.0 margin_top = 5.0
margin_right = 600.0 margin_right = 600.0
@ -48,7 +68,7 @@ margin_bottom = 300.0
custom_colors/default_color = Color( 0, 1, 0.0156863, 1 ) custom_colors/default_color = Color( 0, 1, 0.0156863, 1 )
scroll_following = true scroll_following = true
[node name="Accept" type="Button" parent="Panel/Panel"] [node name="Accept" type="Button" parent="ConsolePanel"]
visible = false visible = false
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 1.0 anchor_top = 1.0
@ -60,7 +80,7 @@ margin_right = 28.0
margin_bottom = -5.0 margin_bottom = -5.0
text = "Accept" text = "Accept"
[node name="Cancel" type="Button" parent="Panel/Panel"] [node name="Cancel" type="Button" parent="ConsolePanel"]
visible = false visible = false
anchor_top = 1.0 anchor_top = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@ -70,14 +90,9 @@ margin_right = 154.0
margin_bottom = -5.0 margin_bottom = -5.0
text = "Cancel" text = "Cancel"
[node name="Search_Descr" type="CheckButton" parent="Panel"] [connection signal="resized" from="." to="." method="_on_Control_resized"]
margin_left = 600.0
margin_right = 782.0
margin_bottom = 40.0
text = "Search in DESCR"
[connection signal="text_entered" from="Panel/LineEdit" to="." method="_on_LineEdit_text_entered"] [connection signal="text_entered" from="Panel/LineEdit" to="." method="_on_LineEdit_text_entered"]
[connection signal="item_selected" from="Panel/Tree" to="." method="_on_Tree_multi_selected"] [connection signal="item_selected" from="Panel/Tree" to="." method="_on_Tree_multi_selected"]
[connection signal="pressed" from="Panel/Button" to="." method="_on_Button_pressed"] [connection signal="pressed" from="Panel/Button" to="." method="_on_Button_pressed"]
[connection signal="pressed" from="Panel/Panel/Accept" to="." method="_on_Accept_pressed"] [connection signal="pressed" from="ConsolePanel/Accept" to="." method="_on_Accept_pressed"]
[connection signal="pressed" from="Panel/Panel/Cancel" to="." method="_on_Cancel_pressed"] [connection signal="pressed" from="ConsolePanel/Cancel" to="." method="_on_Cancel_pressed"]