diff options
Diffstat (limited to 'option_set/option_set_list.gd')
| -rw-r--r-- | option_set/option_set_list.gd | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/option_set/option_set_list.gd b/option_set/option_set_list.gd index 8aad1b1..4a8841f 100644 --- a/option_set/option_set_list.gd +++ b/option_set/option_set_list.gd @@ -7,8 +7,7 @@ const EXACT_SELECTION: bool = false export var clear_signals_on_hide := true -signal item_selected # (idx: int, text: String) -signal nothing_selected # () +signal selection_changed # (idx: int, text: String) export var autowrap := true @@ -24,6 +23,7 @@ var labels_sizes : Array var items : Array var selected_idx := -1 +var selected_item := "" var is_dirty := true var normal_style : StyleBoxFlat @@ -78,6 +78,11 @@ func _init(): sensor.connect("on_scroll", self, "pointer_input_on_scroll_handler") +#func _ready(): +# for idx in range(5): +# add_item(">> %d" % idx) + + func mark_as_dirty(): is_dirty = true @@ -119,6 +124,8 @@ func remove_items(indices: Array): func clear_items(): items.clear() + selected_idx = -1 + selected_item = "" v_scroll_bar.value = 0.0 is_dirty = true @@ -215,26 +222,23 @@ func _process(delta): func get_item_at_position(mouse_position: Vector2) -> int: - if items.size() == 0: - return -1 - var labels_offset := v_scroll_bar.value var position := mouse_position.y + labels_offset var item_idx := labels_end_positions.bsearch(position) - # @DAM Fix this to return -1 if no item was selected. - return int(min(item_idx, items.size()-1)) # Return last item when position is below it. + if item_idx == items.size(): + item_idx = -1 + return item_idx func select(index: int): selected_idx = index - emit_signal("item_selected", selected_idx, items[selected_idx]) + selected_item = items[selected_idx] if selected_idx >= 0 && selected_idx < items.size() else "" + emit_signal("selection_changed", selected_idx, selected_item) -# @DAM Do we really need this? We should have just one signal to the selection. func unselect(): - selected_idx = -1 - emit_signal("nothing_selected") + select(-1) func pointer_input_on_press_handler(pointer: PointerInputSensor.PointerInputData): @@ -262,12 +266,7 @@ func pointer_input_on_end_drag_handler(pointer: PointerInputSensor.PointerInputD func pointer_input_on_click_handler(pointer: PointerInputSensor.PointerInputData): var item_idx := get_item_at_position(pointer.current_position - rect_global_position) - if item_idx >= 0: - select(item_idx) - emit_signal("item_selected", item_idx) - else: - unselect() - emit_signal("nothing_selected") + select(item_idx) func pointer_input_on_scroll_handler(pointer: PointerInputSensor.PointerInputData): @@ -278,7 +277,7 @@ func _clear_signals(): if clear_signals_on_hide == false: return - for signal_name in ["item_selected", "nothing_selected"]: + for signal_name in ["selection_changed"]: for it in get_signal_connection_list(signal_name): disconnect(it.signal, it.target, it.method) |