sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename realm persisted properties to avoid casting necessity

Browse Source
This commit is contained in:
Dean Herbert
2021-01-13 18:07:35 +09:00
parent 9086d75542
commit fcb4a53f37
7 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -165,13 +165,13 @@ namespace osu.Game.Overlays.Toolbar
if (Hotkey != null)
{
realmKeyBinding = realmFactory.Context.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetID == null && rkb.Action == (int)Hotkey.Value);
realmKeyBinding = realmFactory.Context.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetID == null && rkb.ActionInt == (int)Hotkey.Value);
if (realmKeyBinding != null)
{
realmKeyBinding.PropertyChanged += (sender, args) =>
{
if (args.PropertyName == nameof(realmKeyBinding.KeyCombination))
if (args.PropertyName == nameof(realmKeyBinding.KeyCombinationString))
updateKeyBindingTooltip();
};
}
@ -223,7 +223,7 @@ namespace osu.Game.Overlays.Toolbar
{
if (realmKeyBinding != null)
{
KeyCombination? binding = ((IKeyBinding)realmKeyBinding).KeyCombination;
KeyCombination? binding = realmKeyBinding.KeyCombination;
var keyBindingString = binding?.ReadableString();