mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 17:42:54 +08:00
Merge branch 'master' into catch-juice-stream-editing-weirdness-continued
This commit is contained in:
commit
aba05a21aa
@ -305,7 +305,9 @@ namespace osu.Game.Rulesets.Edit
|
|||||||
PlayfieldContentContainer.X = TOOLBOX_CONTRACTED_SIZE_LEFT;
|
PlayfieldContentContainer.X = TOOLBOX_CONTRACTED_SIZE_LEFT;
|
||||||
}
|
}
|
||||||
|
|
||||||
composerFocusMode.Value = PlayfieldContentContainer.Contains(InputManager.CurrentState.Mouse.Position);
|
composerFocusMode.Value = PlayfieldContentContainer.Contains(InputManager.CurrentState.Mouse.Position)
|
||||||
|
&& !LeftToolbox.Contains(InputManager.CurrentState.Mouse.Position)
|
||||||
|
&& !RightToolbox.Contains(InputManager.CurrentState.Mouse.Position);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Playfield Playfield => drawableRulesetWrapper.Playfield;
|
public override Playfield Playfield => drawableRulesetWrapper.Playfield;
|
||||||
|
Loading…
Reference in New Issue
Block a user