sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into popup-filter-effect

Browse Source
This commit is contained in:
Dean Herbert
2021-10-07 18:40:21 +09:00
committed by GitHub
parent 99fb86878e 0e0779e45b
commit f98dd1b811
279 changed files with 4774 additions and 2254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Edit/Components/Menus/DifficultyMenuItem.cs
View File

@ -10,12 +10,12 @@ namespace osu.Game.Screens.Edit.Components.Menus
{
public class DifficultyMenuItem : StatefulMenuItem<bool>
{
public BeatmapInfo Beatmap { get; }
public BeatmapInfo BeatmapInfo { get; }
public DifficultyMenuItem(BeatmapInfo beatmapInfo, bool selected, Action<BeatmapInfo> difficultyChangeFunc)
: base(beatmapInfo.Version ?? "(unnamed)", null)
{
Beatmap = beatmapInfo;
BeatmapInfo = beatmapInfo;
State.Value = selected;
if (!selected)

7
osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
View File

@ -89,6 +89,13 @@ namespace osu.Game.Screens.Edit.Setup
{
public Action OnFocused;
protected override bool OnDragStart(DragStartEvent e)
{
// This text box is intended to be "read only" without actually specifying that.
// As such we don't want to allow the user to select its content with a drag.
return false;
}
protected override void OnFocus(FocusEvent e)
{
OnFocused?.Invoke();