mirror of
https://github.com/ppy/osu
synced 2024-12-14 02:46:27 +00:00
Merge branch 'master' into remove-legacy-id
This commit is contained in:
commit
9b0af901ef
@ -52,7 +52,6 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
|
|
||||||
public override bool HandleNonPositionalInput => State == Visibility.Visible;
|
public override bool HandleNonPositionalInput => State == Visibility.Visible;
|
||||||
public override bool HandlePositionalInput => State == Visibility.Visible;
|
public override bool HandlePositionalInput => State == Visibility.Visible;
|
||||||
public override bool IsRemovable => true;
|
|
||||||
|
|
||||||
private Visibility state;
|
private Visibility state;
|
||||||
|
|
||||||
|
@ -171,6 +171,7 @@ namespace osu.Game.Overlays
|
|||||||
d.Origin = Anchor.BottomLeft;
|
d.Origin = Anchor.BottomLeft;
|
||||||
d.RelativeSizeAxes = Axes.Both;
|
d.RelativeSizeAxes = Axes.Both;
|
||||||
d.OnRequestLeave = channelManager.LeaveChannel;
|
d.OnRequestLeave = channelManager.LeaveChannel;
|
||||||
|
d.IsSwitchable = true;
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -48,6 +48,7 @@ namespace osu.Game.Screens.Select
|
|||||||
Anchor = Anchor.BottomLeft,
|
Anchor = Anchor.BottomLeft,
|
||||||
Origin = Anchor.BottomLeft,
|
Origin = Anchor.BottomLeft,
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
IsSwitchable = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
modsCheckbox = new OsuTabControlCheckbox
|
modsCheckbox = new OsuTabControlCheckbox
|
||||||
|
Loading…
Reference in New Issue
Block a user