mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-11-20 16:20:18 +01:00
Always put node content popups on top, make them darker
This commit is contained in:
parent
6b8b27e626
commit
0e96bd2fc0
2 changed files with 28 additions and 27 deletions
15
node.gd
15
node.gd
|
@ -5,6 +5,8 @@ var content setget content_set
|
|||
var type setget type_set
|
||||
var repository: Control
|
||||
|
||||
onready var content_label = $Content/ContentLabel
|
||||
|
||||
var children = {} setget children_set
|
||||
var id_always_visible = false
|
||||
var held = false
|
||||
|
@ -13,11 +15,7 @@ var hovered = false
|
|||
var arrow = preload("res://arrow.tscn")
|
||||
|
||||
func _ready():
|
||||
# var t = Timer.new()
|
||||
# t.wait_time = rand_range(0.0, 0.1)
|
||||
# add_child(t)
|
||||
# t.start()
|
||||
# yield(t, "timeout")
|
||||
content_set(content)
|
||||
$Pop.pitch_scale = rand_range(0.8, 1.2)
|
||||
$Pop.play()
|
||||
|
||||
|
@ -50,7 +48,8 @@ func id_set(new_id):
|
|||
|
||||
func content_set(new_content):
|
||||
content = new_content
|
||||
$Content.text = content
|
||||
if content_label:
|
||||
content_label.text = content
|
||||
|
||||
func type_set(new_type):
|
||||
type = new_type
|
||||
|
@ -99,13 +98,13 @@ func children_set(new_children):
|
|||
func _on_hover():
|
||||
hovered = true
|
||||
if not id_always_visible:
|
||||
$Content.visible = true
|
||||
content_label.visible = true
|
||||
$ID.visible = true
|
||||
|
||||
func _on_unhover():
|
||||
hovered = false
|
||||
if not id_always_visible:
|
||||
$Content.visible = false
|
||||
content_label.visible = false
|
||||
$ID.visible = false
|
||||
|
||||
func _input(event):
|
||||
|
|
40
node.tscn
40
node.tscn
|
@ -6,20 +6,20 @@
|
|||
[ext_resource path="res://nodes/pop.wav" type="AudioStream" id=4]
|
||||
[ext_resource path="res://drop_area.tscn" type="PackedScene" id=5]
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=1]
|
||||
[sub_resource type="CircleShape2D" id=1]
|
||||
radius = 23.6295
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=2]
|
||||
content_margin_left = 5.0
|
||||
content_margin_right = 5.0
|
||||
content_margin_top = 5.0
|
||||
content_margin_bottom = 5.0
|
||||
bg_color = Color( 1, 1, 1, 0.0745098 )
|
||||
bg_color = Color( 0, 0, 0, 0.878431 )
|
||||
corner_radius_top_left = 5
|
||||
corner_radius_top_right = 5
|
||||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[sub_resource type="CircleShape2D" id=2]
|
||||
radius = 23.6295
|
||||
|
||||
[node name="Node" type="Node2D"]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
|
@ -57,25 +57,27 @@ __meta__ = {
|
|||
[node name="Pop" type="AudioStreamPlayer2D" parent="."]
|
||||
stream = ExtResource( 4 )
|
||||
|
||||
[node name="Content" type="Label" parent="."]
|
||||
visible = false
|
||||
margin_left = -22.2898
|
||||
margin_top = 30.1969
|
||||
margin_right = -12.2898
|
||||
margin_bottom = 65.1969
|
||||
custom_styles/normal = SubResource( 1 )
|
||||
custom_fonts/font = ExtResource( 2 )
|
||||
custom_colors/font_color = Color( 1, 1, 1, 1 )
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="DropArea" parent="." instance=ExtResource( 5 )]
|
||||
|
||||
[node name="Area2D" type="Area2D" parent="."]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
|
||||
shape = SubResource( 2 )
|
||||
shape = SubResource( 1 )
|
||||
|
||||
[node name="Content" type="Node2D" parent="."]
|
||||
z_index = 1
|
||||
|
||||
[node name="ContentLabel" type="Label" parent="Content"]
|
||||
margin_left = -22.2898
|
||||
margin_top = 30.1969
|
||||
margin_right = -12.2898
|
||||
margin_bottom = 65.1969
|
||||
custom_styles/normal = SubResource( 2 )
|
||||
custom_fonts/font = ExtResource( 2 )
|
||||
custom_colors/font_color = Color( 1, 1, 1, 1 )
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
[connection signal="mouse_entered" from="Rect" to="." method="_on_hover"]
|
||||
[connection signal="mouse_exited" from="Rect" to="." method="_on_unhover"]
|
||||
[connection signal="mouse_entered" from="Area2D" to="." method="_on_hover"]
|
||||
|
|
Loading…
Reference in a new issue