diff options
| -rw-r--r-- | main.tscn | 4 | ||||
| -rw-r--r-- | readme.md | 2 | ||||
| -rw-r--r-- | touch_item_list/touch_item_list.tscn | 1 | ||||
| -rw-r--r-- | touch_vertical_container/touch_vertical_container.gd | 9 | ||||
| -rw-r--r-- | touch_vertical_container/touch_vertical_container.tscn | 1 |
5 files changed, 11 insertions, 6 deletions
@@ -15,8 +15,6 @@ [node name="main" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -4.0 -margin_right = -4.0 theme = ExtResource( 3 ) script = ExtResource( 1 ) __meta__ = { @@ -24,7 +22,6 @@ __meta__ = { } [node name="database" parent="." instance=ExtResource( 11 )] -margin_top = 0.0 script = ExtResource( 5 ) [node name="menu" type="MenuButton" parent="database"] @@ -262,7 +259,6 @@ anchor_bottom = 1.0 color = Color( 0, 0, 0, 0.75 ) [node name="list" parent="popup_list" instance=ExtResource( 11 )] -margin_top = 0.0 [node name="debug" type="Label" parent="."] visible = false @@ -43,6 +43,8 @@ Surgery Log has_permissions = true ``` - [x] Fix the show option sets buttons; they are drawn over the input fields and hide inserted text; +- [x] The stage control must be set to ignore the mouse, otherwise the touch-sensor conflicts with the built-in scroll; +- [ ] On database, selecting an entry and removing it will leave the action buttons visible while no entry is selected; - [ ] Allow to parse option sets from database file; - [ ] Database menu and action buttons are not nice; Improve appearance; - [ ] check if import_option_sets, store_option_sets, store_database require the parameter save_changes; this requires changes on databse, stage and menu scripts; diff --git a/touch_item_list/touch_item_list.tscn b/touch_item_list/touch_item_list.tscn index 6207e7d..072f5b8 100644 --- a/touch_item_list/touch_item_list.tscn +++ b/touch_item_list/touch_item_list.tscn @@ -6,7 +6,6 @@ [node name="item_list" type="ItemList"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 60.0 mouse_filter = 2 script = ExtResource( 2 ) __meta__ = { diff --git a/touch_vertical_container/touch_vertical_container.gd b/touch_vertical_container/touch_vertical_container.gd index 1a7236c..df89e7f 100644 --- a/touch_vertical_container/touch_vertical_container.gd +++ b/touch_vertical_container/touch_vertical_container.gd @@ -7,10 +7,15 @@ var is_pointer_dragging := false var pointer_drag_velocity := 0.0 var exclude_controls := [] +onready var controls = get_node("controls") + func _ready(): + assert(controls != null, "TouchVerticalContainer failed to get 'controls' node.") + + var item_list_separation := float(controls.get_constant("separation")) - for it in get_node("controls").get_children(): + for it in controls.get_children(): it = it as Control if exclude_controls.has(it.name): continue @@ -21,6 +26,8 @@ func _ready(): sensor.name = "sensor" sensor.anchor_right = 1.0 sensor.anchor_bottom = 1.0 + sensor.margin_top = - item_list_separation / 2.0 + sensor.margin_bottom = item_list_separation / 2.0 sensor.connect("on_press", self, "pointer_input_on_press_handler") sensor.connect("on_drag", self, "pointer_input_on_drag_handler") diff --git a/touch_vertical_container/touch_vertical_container.tscn b/touch_vertical_container/touch_vertical_container.tscn index 770ac38..5a797d3 100644 --- a/touch_vertical_container/touch_vertical_container.tscn +++ b/touch_vertical_container/touch_vertical_container.tscn @@ -5,6 +5,7 @@ [node name="scroll_container" type="ScrollContainer"] anchor_right = 1.0 anchor_bottom = 1.0 +mouse_filter = 2 scroll_horizontal_enabled = false script = ExtResource( 1 ) __meta__ = { |