Skip to content

Commit 89b6d7c

Browse files
authored
Merge pull request #32149 from peppy/preview-time-display
Adjust preview time display to not conflict with bookmarks
2 parents f9c73e6 + e1723ec commit 89b6d7c

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/PreviewTimePart.cs

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using osu.Framework.Allocation;
55
using osu.Framework.Bindables;
6+
using osu.Framework.Graphics;
67
using osu.Framework.Graphics.Cursor;
78
using osu.Framework.Localisation;
89
using osu.Game.Extensions;
@@ -36,6 +37,10 @@ public PreviewTimeVisualisation(double time)
3637
: base(time)
3738
{
3839
Alpha = 0.8f;
40+
41+
// Display as a small circle on the middle line as to not clash with other displays.
42+
RelativeSizeAxes = Axes.None;
43+
Height = Width = 5;
3944
}
4045

4146
[BackgroundDependencyLoader]

osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs

+6-7
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@ private void load(OverlayColourProvider colourProvider)
5252
},
5353
}
5454
},
55-
new PreviewTimePart
56-
{
57-
Anchor = Anchor.Centre,
58-
Origin = Anchor.TopCentre,
59-
RelativeSizeAxes = Axes.Both,
60-
Height = 0.4f,
61-
},
6255
new BreakPart
6356
{
6457
Anchor = Anchor.Centre,
@@ -85,6 +78,12 @@ private void load(OverlayColourProvider colourProvider)
8578
RelativeSizeAxes = Axes.Both,
8679
Height = 0.4f
8780
},
81+
new PreviewTimePart
82+
{
83+
Anchor = Anchor.Centre,
84+
Origin = Anchor.Centre,
85+
RelativeSizeAxes = Axes.Both,
86+
},
8887
new MarkerPart { RelativeSizeAxes = Axes.Both },
8988
};
9089
}

0 commit comments

Comments
 (0)