Skip to content

Commit

Permalink
Fixed editor timeline global and local buttons being able to be on at…
Browse files Browse the repository at this point in the history
… the same time (#5297)

* Fixed global and local event view buttons not being in the same group

and being instead toggleable separately

* Fixed the player species timeline highlight background width

being way too narrow now, I can't remember what it exactly was before but this is at least much more visible now
  • Loading branch information
hhyyrylainen authored Jul 30, 2024
1 parent 28420d9 commit 3f2adbc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
6 changes: 5 additions & 1 deletion src/microbe_stage/editor/MicrobeEditorReportComponent.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=24 format=3 uid="uid://qdqcbnri7vsw"]
[gd_scene load_steps=25 format=3 uid="uid://qdqcbnri7vsw"]

[ext_resource type="PackedScene" path="res://src/gui_common/CustomRichTextLabel.tscn" id="2"]
[ext_resource type="LabelSettings" uid="uid://dcekwe8j7ep16" path="res://src/gui_common/fonts/Title-SemiBold-AlmostHuge.tres" id="3_ocn33"]
Expand Down Expand Up @@ -32,6 +32,8 @@ corner_radius_bottom_left = 5

[sub_resource type="StyleBoxEmpty" id="30"]

[sub_resource type="ButtonGroup" id="ButtonGroup_hdykd"]

[sub_resource type="ButtonGroup" id="ButtonGroup_d1pk0"]

[sub_resource type="StyleBoxFlat" id="27"]
Expand Down Expand Up @@ -341,6 +343,7 @@ theme_override_fonts/font = ExtResource("10_dmd4f")
theme_override_font_sizes/font_size = 12
toggle_mode = true
action_mode = 0
button_group = SubResource("ButtonGroup_hdykd")
text = "GLOBAL_INITIAL_LETTER"

[node name="LocalFilter" type="Button" parent="MarginContainer/HSplitContainer/PanelContainer/MarginContainer/VBoxContainer/TimelinePanel/MarginContainer/MarginContainer/HBoxContainer"]
Expand All @@ -352,6 +355,7 @@ theme_override_fonts/font = ExtResource("10_dmd4f")
theme_override_font_sizes/font_size = 12
toggle_mode = true
action_mode = 0
button_group = SubResource("ButtonGroup_hdykd")
text = "LOCAL_INITIAL_LETTER"

[node name="TopFade" type="TextureRect" parent="MarginContainer/HSplitContainer/PanelContainer/MarginContainer/VBoxContainer/TimelinePanel"]
Expand Down
17 changes: 8 additions & 9 deletions src/microbe_stage/editor/TimelineEventHighlight.tres
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[gd_resource type="StyleBoxTexture" load_steps=3 format=2]
[gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://b6ugrigxlvajw"]

[sub_resource type="Gradient" id=1]
colors = PackedColorArray( 0.0666667, 0.509804, 0.835294, 0.470588, 0.0666667, 0.698039, 0.835294, 0 )
[sub_resource type="Gradient" id="1"]
colors = PackedColorArray(0.0666667, 0.509804, 0.835294, 0.470588, 0.0666667, 0.698039, 0.835294, 0)

[sub_resource type="GradientTexture2D" id=2]
gradient = SubResource( 1 )
[sub_resource type="GradientTexture2D" id="2"]
gradient = SubResource("1")
width = 1024

[resource]
texture = SubResource( 2 )
region_rect = Rect2( 0, 0, 2048, 1 )
margin_left = 3.0
margin_right = 3.0
texture = SubResource("2")
region_rect = Rect2(0, 0, 2048, 1)

0 comments on commit 3f2adbc

Please sign in to comment.