From 80733e322257656c7a93ad329e06fcda487da884 Mon Sep 17 00:00:00 2001
From: dam <dam@gudinoff>
Date: Sat, 2 Apr 2022 09:41:54 +0000
Subject: Sets the stage action buttons side by side.

---
 logic/stage.gd |  8 ++++++--
 main.tscn      | 28 ++++++++++------------------
 readme.md      |  1 +
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/logic/stage.gd b/logic/stage.gd
index 33b0644..2101ad9 100644
--- a/logic/stage.gd
+++ b/logic/stage.gd
@@ -37,18 +37,22 @@ onready var pathology		:= get_node("controls/pathology") as OptionSet
 onready var intervention	:= get_node("controls/intervention") as OptionSet
 onready var is_urgency		:= get_node("controls/is_urgency") as Button
 onready var notes			:= get_node("controls/notes") as LineEdit
-onready var save_button		:= get_node("controls/save") as Button
-onready var discard_button	:= get_node("controls/discard") as Button
+onready var save_button		:= get_node("controls/buttons/save") as Button
+onready var discard_button	:= get_node("controls/buttons/discard") as Button
 onready var scrollbar		:= get_v_scrollbar()
 onready var popup			:= get_node("/root/main/popup") as ModalPopup
 onready var dialog			:= get_node("/root/main/dialog") as Dialog
 
+
 func _init():
 	exclude_controls = ["date_picker", "save", "discard"]
 	load_option_sets()
 
 
 func _ready():
+	# Fix height of buttons container.
+	(get_node("controls/buttons") as Control).rect_min_size.y = save_button.rect_size.y
+	
 	scrollbar.connect("visibility_changed", self, "adjust_layout")
 	save_button.connect("pressed", self, "save_action")
 	discard_button.connect("pressed", self, "discard_action")
diff --git a/main.tscn b/main.tscn
index d388cb5..ba50f42 100644
--- a/main.tscn
+++ b/main.tscn
@@ -206,29 +206,21 @@ placeholder_text = "Notas"
 caret_blink = true
 caret_blink_speed = 0.5
 
-[node name="discard" type="Button" parent="stage/controls" index="13"]
+[node name="buttons" type="Control" parent="stage/controls" index="13"]
 margin_top = 994.0
 margin_right = 1080.0
-margin_bottom = 1052.0
-grow_horizontal = 2
-grow_vertical = 2
-rect_min_size = Vector2( 0, 50 )
+margin_bottom = 994.0
+
+[node name="discard" type="Button" parent="stage/controls/buttons"]
+anchor_right = 0.5
 text = "discard"
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
-[node name="save" type="Button" parent="stage/controls" index="14"]
-margin_top = 1056.0
-margin_right = 1080.0
-margin_bottom = 1114.0
-grow_horizontal = 2
-grow_vertical = 2
-rect_min_size = Vector2( 0, 50 )
+[node name="save" type="Button" parent="stage/controls/buttons"]
+anchor_left = 0.5
+anchor_right = 1.0
+margin_bottom = 58.0
+grow_horizontal = 0
 text = "save"
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="file_picker" type="FileDialog" parent="."]
 anchor_right = 1.0
diff --git a/readme.md b/readme.md
index 7b73115..aa1d545 100644
--- a/readme.md
+++ b/readme.md
@@ -58,6 +58,7 @@ Surgery Log
 - [x] Fix automation to automatically disconnect acceptance signal handlers when reject is chosen on file_picker/confirm_action;
 - [x] Use popup to display confirmation messages;
 - [x] Improve option sets: selecting outside optionset entry should select none; if no options are available, show nothing instead of "--";
+- [x] Set stage discard/save buttons side by side;
 - [ ] Fix back button:
     - on stage screen should show pop-up asking it changes are to be discarded;
     - on file-pickers screen should close them;
-- 
cgit v1.2.3