From 177fb734c21a583b3fedf91c0cad77137cffcf4d Mon Sep 17 00:00:00 2001 From: dam Date: Mon, 28 Mar 2022 15:47:08 +0000 Subject: Moved screen dots per inch initialization to onready var. --- date_picker/value_picker.gd | 13 ++++++------- main.gd | 1 - pointer_input_sensor.gd | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/date_picker/value_picker.gd b/date_picker/value_picker.gd index 7429edd..ca1bcf4 100644 --- a/date_picker/value_picker.gd +++ b/date_picker/value_picker.gd @@ -10,22 +10,22 @@ const DRAG_THRESHOLD_CM: float = 0.250 export var min_value: int export var max_value: int -onready var input := get_node("current/input") as LineEdit -onready var label_previous := get_node("previous") as Label -onready var label_current := get_node("current") as Label -onready var label_next := get_node("next") as Label - var pointer: Dictionary var anchor: float var value: int var offset: float -var screen_dpcm: float var scroll_unit_height: float var label_previous_base_position: float var label_current_base_position: float var label_next_base_position: float +onready var input := get_node("current/input") as LineEdit +onready var label_previous := get_node("previous") as Label +onready var label_current := get_node("current") as Label +onready var label_next := get_node("next") as Label +onready var screen_dpcm := float(OS.get_screen_dpi()) / 2.54 + func _ready(): pointer = { @@ -41,7 +41,6 @@ func _ready(): input.connect("focus_entered", self, "input_focus_entered") input.connect("focus_exited", self, "input_focus_exited") - screen_dpcm = float(OS.get_screen_dpi()) / 2.54 scroll_unit_height = label_current.rect_size.y label_previous_base_position = label_previous.rect_position.y label_current_base_position = label_current.rect_position.y diff --git a/main.gd b/main.gd index 5a78ede..37c5ed6 100644 --- a/main.gd +++ b/main.gd @@ -22,7 +22,6 @@ func _init(): OS.request_permissions() - func _ready(): Input.set_use_accumulated_input(false) confirm_action.get_cancel().connect("pressed", self, "dialog_cancelled", ["confirmed"]) diff --git a/pointer_input_sensor.gd b/pointer_input_sensor.gd index 588bb81..f99fc17 100644 --- a/pointer_input_sensor.gd +++ b/pointer_input_sensor.gd @@ -46,11 +46,11 @@ class PointerInputData: export var drag_threshold_cm: float = 0.250 var pointer: PointerInputData -var screen_dpcm: float + +onready var screen_dpcm := float(OS.get_screen_dpi()) / 2.54 func _ready(): - screen_dpcm = float(OS.get_screen_dpi()) / 2.54 pointer = PointerInputData.new() pointer.target = self connect("mouse_entered", self, "_on_enter_exit", [true]) -- cgit v1.2.3