diff --git a/Assets/Scripts/Player Controls/interact.gd b/Assets/Scripts/Player Controls/interact.gd index a7adcd5..695d622 100644 --- a/Assets/Scripts/Player Controls/interact.gd +++ b/Assets/Scripts/Player Controls/interact.gd @@ -29,10 +29,10 @@ func _input(event: InputEvent) -> void: match event.keycode: KEY_PAGEUP: - terminal.ScrollUp() + terminal.call_deferred("ScrollUp") KEY_PAGEDOWN: - terminal.ScrollDown() + terminal.call_deferred("ScrollDown") KEY_BACKSPACE: terminal.InputDelChar() diff --git a/Assets/Scripts/UI/terminal/terminal_controls.gd b/Assets/Scripts/UI/terminal/terminal_controls.gd index b1073c9..9d023f9 100644 --- a/Assets/Scripts/UI/terminal/terminal_controls.gd +++ b/Assets/Scripts/UI/terminal/terminal_controls.gd @@ -211,28 +211,17 @@ help : Show this menu -------------------------") func ScrollUp(): - #var scroll: ScrollContainer = $MarginContainer/ScrollContainer + var scroll: ScrollContainer = $MarginContainer/ScrollContainer - #await get_tree().create_timer(.0001).timeout - #scroll.set_deferred("scroll_vertical", scroll.get_v_scroll_bar().value - 10 ) - #call_deferred("ScrollUp") - - var scrolli: RichTextLabel = $MarginContainer/ScrollContainer/VBoxContainer/Label - - var scroll = scrolli.get_v_scroll_bar() - - var tween: = create_tween() - tween.tween_property(scroll, "value", scroll.value - (scroll.page - scroll.page * 0.1), 0.1) - get_tree().get_root().set_input_as_handled() - + await get_tree().create_timer(.0001).timeout + scroll.set_deferred("scroll_vertical", scroll.get_v_scroll_bar().value - 100 ) func ScrollDown(): var scroll: ScrollContainer = $MarginContainer/ScrollContainer await get_tree().create_timer(.0001).timeout - scroll.set_deferred("scroll_vertical", scroll.get_v_scroll_bar().value + 10 ) - call_deferred("ScrollDown") + scroll.set_deferred("scroll_vertical", scroll.get_v_scroll_bar().value + 100 ) @@ -242,8 +231,8 @@ func GetBottomScroll(): await get_tree().create_timer(.01).timeout scroll.set_deferred("scroll_vertical", scrollMax) - #scroll.vertical_scroll_mode = ScrollContainer.SCROLL_MODE_SHOW_NEVER - call_deferred("GetBottomScroll") + scroll.vertical_scroll_mode = ScrollContainer.SCROLL_MODE_SHOW_NEVER + #call_deferred("GetBottomScroll") func UpdateCaretPos():