h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 10:43:22 +08:00
Code Issues Releases Wiki Activity

Remove setting for right-mouse scroll (make it always applicable)

Browse Source
This commit is contained in:
Dean Herbert 2025-01-16 19:35:49 +09:00
parent 6b921fc4e4
commit 56b450c4a6
No known key found for this signature in database
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -170,8 +170,6 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.ScreenshotFormat, ScreenshotFormat.Jpg); SetDefault(OsuSetting.ScreenshotFormat, ScreenshotFormat.Jpg);
SetDefault(OsuSetting.ScreenshotCaptureMenuCursor, false); SetDefault(OsuSetting.ScreenshotCaptureMenuCursor, false);
SetDefault(OsuSetting.SongSelectRightMouseScroll, false);
SetDefault(OsuSetting.Scaling, ScalingMode.Off); SetDefault(OsuSetting.Scaling, ScalingMode.Off);
SetDefault(OsuSetting.SafeAreaConsiderations, true); SetDefault(OsuSetting.SafeAreaConsiderations, true);
SetDefault(OsuSetting.ScalingBackgroundDim, 0.9f, 0.5f, 1f, 0.01f); SetDefault(OsuSetting.ScalingBackgroundDim, 0.9f, 0.5f, 1f, 0.01f);
@ -401,7 +399,6 @@ namespace osu.Game.Configuration
Skin, Skin,
ScreenshotFormat, ScreenshotFormat,
ScreenshotCaptureMenuCursor, ScreenshotCaptureMenuCursor,
SongSelectRightMouseScroll,
BeatmapSkins, BeatmapSkins,
BeatmapColours, BeatmapColours,
BeatmapHitsounds, BeatmapHitsounds,

6
osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
View File

@ -19,12 +19,6 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new SettingsCheckbox
{
ClassicDefault = true,
LabelText = UserInterfaceStrings.RightMouseScroll,
Current = config.GetBindable<bool>(OsuSetting.SongSelectRightMouseScroll),
},
new SettingsCheckbox new SettingsCheckbox
{ {
LabelText = UserInterfaceStrings.ShowConvertedBeatmaps, LabelText = UserInterfaceStrings.ShowConvertedBeatmaps,

6
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -184,8 +184,6 @@ namespace osu.Game.Screens.Select
private readonly Cached itemsCache = new Cached(); private readonly Cached itemsCache = new Cached();
private PendingScrollOperation pendingScrollOperation = PendingScrollOperation.None; private PendingScrollOperation pendingScrollOperation = PendingScrollOperation.None;
public Bindable<bool> RightClickScrollingEnabled = new Bindable<bool>();
public Bindable<RandomSelectAlgorithm> RandomAlgorithm = new Bindable<RandomSelectAlgorithm>(); public Bindable<RandomSelectAlgorithm> RandomAlgorithm = new Bindable<RandomSelectAlgorithm>();
private readonly List<CarouselBeatmapSet> previouslyVisitedRandomSets = new List<CarouselBeatmapSet>(); private readonly List<CarouselBeatmapSet> previouslyVisitedRandomSets = new List<CarouselBeatmapSet>();
private readonly List<CarouselBeatmap> randomSelectedBeatmaps = new List<CarouselBeatmap>(); private readonly List<CarouselBeatmap> randomSelectedBeatmaps = new List<CarouselBeatmap>();
@ -210,6 +208,7 @@ namespace osu.Game.Screens.Select
setPool, setPool,
Scroll = new CarouselScrollContainer Scroll = new CarouselScrollContainer
{ {
RightMouseScrollbar = true,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
noResultsPlaceholder = new NoResultsPlaceholder() noResultsPlaceholder = new NoResultsPlaceholder()
@ -226,9 +225,6 @@ namespace osu.Game.Screens.Select
randomSelectSample = audio.Samples.Get(@"SongSelect/select-random"); randomSelectSample = audio.Samples.Get(@"SongSelect/select-random");
config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm); config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
RightClickScrollingEnabled.BindValueChanged(enabled => Scroll.RightMouseScrollbar = enabled.NewValue, true);
detachedBeatmapSets = beatmaps.GetBeatmapSets(cancellationToken); detachedBeatmapSets = beatmaps.GetBeatmapSets(cancellationToken);
detachedBeatmapSets.BindCollectionChanged(beatmapSetsChanged); detachedBeatmapSets.BindCollectionChanged(beatmapSetsChanged);