From fd77e04cbac65a41a8d786599192e1b2e2c9d5f2 Mon Sep 17 00:00:00 2001 From: oier Date: Sun, 8 Oct 2023 05:11:29 +0200 Subject: [PATCH] tooltip cleanup --- .../escoria-ui-return-monkey-island/game.tscn | 5 ---- .../tooltip/ESCTooltipWithIcon.gd | 26 ------------------- .../tooltip/ESCTooltipWithIcon.tscn | 22 ---------------- 3 files changed, 53 deletions(-) delete mode 100644 gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.gd delete mode 100644 gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.tscn diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn index 453d080b..60b2e827 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn @@ -91,11 +91,6 @@ visible = false [node name="tooltip_layer" type="CanvasLayer" parent="."] layer = 2 -[node name="tooltipOld" parent="tooltip_layer" instance=ExtResource( 6 )] -mouse_filter = 2 -bbcode_text = "[center][color=#000000][/color][/center]" -fit_content_height = true -offset_from_cursor = Vector2( 0, 20 ) [node name="tooltip2" parent="tooltip_layer" instance=ExtResource( 10 )] mouse_filter = 2 diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.gd b/gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.gd deleted file mode 100644 index b5a85837..00000000 --- a/gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.gd +++ /dev/null @@ -1,26 +0,0 @@ -extends HBoxContainer - - -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" -#func _ready(): - #if $label.connect("tooltip_size_updated", self, "update_tooltip_following_mouse_position", [tooltip_node]) != 0: - # escoria.logger.error(self, "Error connecting tooltip_size_updated") - #if $tooltip_layer/tooltip2.connect("tooltip2_size_updated", self, "update_tooltip_following_mouse_position", [tooltip2_node]) != 0: - # escoria.logger.error(self, "Error connecting tooltip2_size_updated") -signal tooltip_size_updated -# Called when the node enters the scene tree for the first time. - - -func set_target(target: String, needs_second_target: bool = false): - $label.set_target(target, needs_second_target) - - -func set_target2(target: String, needs_second_target: bool = false): - $label.set_target2(target, needs_second_target) -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass -func update_tooltip_text(): - $label.update_tooltip_text() diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.tscn deleted file mode 100644 index 1cb1a206..00000000 --- a/gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip/target_tooltip.tscn" type="PackedScene" id=1] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.gd" type="Script" id=2] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_left.png" type="Texture" id=3] - -[node name="tooltip" type="HBoxContainer"] -margin_right = 40.0 -margin_bottom = 40.0 -alignment = 1 -script = ExtResource( 2 ) - -[node name="icon" type="TextureRect" parent="."] -margin_left = 10.0 -margin_right = 26.0 -margin_bottom = 40.0 -texture = ExtResource( 3 ) - -[node name="label" parent="." instance=ExtResource( 1 )] -margin_left = 30.0 -margin_right = 30.0 -margin_bottom = 40.0