mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2025-03-06 14:27:48 +00:00
Merge pull request #617 from WallK/feat/godot-configurator-w
Fix mouse control, reposition mascot, tooltips
This commit is contained in:
commit
2807fc770d
|
@ -2,7 +2,21 @@ extends Control
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
$MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer/resume.grab_focus() #Required to enable controller focusing
|
$MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer/resume.grab_focus() #Required to enable controller focusing
|
||||||
|
var children = findElements(self, "Control")
|
||||||
|
#print(children)
|
||||||
|
for n: Control in children:
|
||||||
|
n.mouse_entered.connect(_on_control_mouse_entered.bind(n))
|
||||||
|
|
||||||
func _input(event):
|
func _input(event):
|
||||||
if event.is_action_pressed("quit"):
|
if event.is_action_pressed("quit"):
|
||||||
get_tree().quit()
|
get_tree().quit()
|
||||||
|
|
||||||
|
func findElements(node: Node, className: String, result: Array = []) -> Array:
|
||||||
|
if node.is_class(className):
|
||||||
|
result.push_back(node)
|
||||||
|
for child in node.get_children():
|
||||||
|
result = findElements(child, className, result)
|
||||||
|
return result
|
||||||
|
|
||||||
|
func _on_control_mouse_entered(control: Node):
|
||||||
|
control.grab_focus()
|
||||||
|
|
|
@ -145,14 +145,13 @@ metadata/description = "This is a test description set to this element"
|
||||||
|
|
||||||
[node name="Button" type="Button" parent="MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer"]
|
[node name="Button" type="Button" parent="MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer"]
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
disabled = true
|
|
||||||
text = "Advanced"
|
text = "Advanced"
|
||||||
|
|
||||||
[node name="rewind" type="CheckButton" parent="MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer"]
|
[node name="rewind" type="CheckButton" parent="MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer"]
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
theme_override_constants/h_separation = 256
|
theme_override_constants/h_separation = 256
|
||||||
text = "Rewind"
|
text = "Rewind"
|
||||||
metadata/description = "This is another description. Very long text anyone? Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
|
metadata/description = "This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED. And I did it twice!!!This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED."
|
||||||
|
|
||||||
[node name="Button2" type="Button" parent="MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer"]
|
[node name="Button2" type="Button" parent="MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer"]
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
|
@ -807,11 +806,15 @@ scroll_active = false
|
||||||
|
|
||||||
[node name="Rekku" type="Control" parent="."]
|
[node name="Rekku" type="Control" parent="."]
|
||||||
layout_mode = 1
|
layout_mode = 1
|
||||||
anchors_preset = 15
|
anchors_preset = 7
|
||||||
anchor_right = 1.0
|
anchor_left = 0.5
|
||||||
|
anchor_top = 1.0
|
||||||
|
anchor_right = 0.5
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
grow_horizontal = 2
|
grow_horizontal = 2
|
||||||
grow_vertical = 2
|
grow_vertical = 0
|
||||||
|
mouse_filter = 1
|
||||||
|
mouse_default_cursor_shape = 8
|
||||||
script = ExtResource("4_nqqx3")
|
script = ExtResource("4_nqqx3")
|
||||||
|
|
||||||
[node name="bubble" type="Panel" parent="Rekku"]
|
[node name="bubble" type="Panel" parent="Rekku"]
|
||||||
|
@ -850,9 +853,10 @@ scroll_following = true
|
||||||
script = ExtResource("5_cprkf")
|
script = ExtResource("5_cprkf")
|
||||||
|
|
||||||
[node name="RekkuSprite" type="Sprite2D" parent="Rekku"]
|
[node name="RekkuSprite" type="Sprite2D" parent="Rekku"]
|
||||||
position = Vector2(1125, 586)
|
position = Vector2(490, -194)
|
||||||
scale = Vector2(0.292969, 0.292969)
|
scale = Vector2(0.292969, 0.292969)
|
||||||
texture = ExtResource("9_brsrf")
|
texture = ExtResource("9_brsrf")
|
||||||
|
metadata/_edit_group_ = true
|
||||||
|
|
||||||
[node name="blink" type="AnimatedSprite2D" parent="Rekku/RekkuSprite"]
|
[node name="blink" type="AnimatedSprite2D" parent="Rekku/RekkuSprite"]
|
||||||
sprite_frames = SubResource("SpriteFrames_trwmf")
|
sprite_frames = SubResource("SpriteFrames_trwmf")
|
||||||
|
|
|
@ -25,6 +25,10 @@ window/size/borderless=true
|
||||||
window/size/transparent=true
|
window/size/transparent=true
|
||||||
window/per_pixel_transparency/allowed=true
|
window/per_pixel_transparency/allowed=true
|
||||||
|
|
||||||
|
[filesystem]
|
||||||
|
|
||||||
|
import/blender/enabled=false
|
||||||
|
|
||||||
[gui]
|
[gui]
|
||||||
|
|
||||||
theme/custom="res://res/pixel_ui_theme/RetroDECKTheme.tres"
|
theme/custom="res://res/pixel_ui_theme/RetroDECKTheme.tres"
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue