From c8c375636fab9a166326d6d0ae61d3c6b3b8790d Mon Sep 17 00:00:00 2001 From: Aergwyn Date: Fri, 25 Jan 2019 19:34:25 +0900 Subject: [PATCH 1/6] Use lambda Co-Authored-By: peppy --- osu.Game/Graphics/UserInterface/FocusedTextBox.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs index 9eac0c1109..73c9c0dd0e 100644 --- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs +++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs @@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterface public bool HoldFocus { - get { return allowImmediateFocus && focus; } + get => allowImmediateFocus && focus; set { focus = value; From 5c70be07ab3d6bbd14a95de5c9561450653dffbf Mon Sep 17 00:00:00 2001 From: phosphene47 Date: Fri, 25 Jan 2019 22:58:55 +1100 Subject: [PATCH 2/6] Display carousel over beatmap info wedge --- osu.Game/Screens/Select/SongSelect.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index c33e718540..e30b5914be 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -123,6 +123,16 @@ namespace osu.Game.Screens.Select Padding = new MarginPadding { Top = 10, Right = 5 }, } }, + beatmapInfoWedge = new BeatmapInfoWedge + { + Size = wedged_container_size, + RelativeSizeAxes = Axes.X, + Margin = new MarginPadding + { + Top = left_area_padding, + Right = left_area_padding, + }, + }, new Container { RelativeSizeAxes = Axes.Both, @@ -163,16 +173,6 @@ namespace osu.Game.Screens.Select } }, }, - beatmapInfoWedge = new BeatmapInfoWedge - { - Size = wedged_container_size, - RelativeSizeAxes = Axes.X, - Margin = new MarginPadding - { - Top = left_area_padding, - Right = left_area_padding, - }, - }, new ResetScrollContainer(() => Carousel.ScrollToSelected()) { RelativeSizeAxes = Axes.Y, From e939f75f4bcf20f96873d9028e352b1d46c4b4dc Mon Sep 17 00:00:00 2001 From: ProgrammaticNajel Date: Sat, 26 Jan 2019 18:19:01 +0800 Subject: [PATCH 3/6] Transform screen mouse coordinates to local space coordinates. --- .../Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs index 0dcf5ba551..ee28f4ae6b 100644 --- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs +++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs @@ -22,8 +22,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles { base.LoadComplete(); - // Fixes a 1-frame position discrpancy due to the first mouse move event happening in the next frame - HitObject.Position = GetContainingInputManager().CurrentState.Mouse.Position; + // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame + HitObject.Position = Parent.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position); } protected override bool OnClick(ClickEvent e) From e71b13683a1189ae8fda808b2b2f22674e651900 Mon Sep 17 00:00:00 2001 From: ProgrammaticNajel Date: Sat, 26 Jan 2019 22:55:33 +0800 Subject: [PATCH 4/6] Add null check --- .../Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs index ee28f4ae6b..07c3132282 100644 --- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs +++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs @@ -5,6 +5,7 @@ using osu.Framework.Input.Events; using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components; using osu.Game.Rulesets.Osu.Objects; +using osuTK; namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles { @@ -23,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles base.LoadComplete(); // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame - HitObject.Position = Parent.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position); + HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position)?? Vector2.Zero; } protected override bool OnClick(ClickEvent e) From 0797f5d644b80e1f6c5b62a5864b6f3a5e1c2d4d Mon Sep 17 00:00:00 2001 From: ProgrammaticNajel Date: Sat, 26 Jan 2019 22:56:31 +0800 Subject: [PATCH 5/6] Update SliderPlacementBlueprint.cs --- .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs index f563ad2264..989a53db1f 100644 --- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs +++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs @@ -47,6 +47,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders setState(PlacementState.Initial); } + protected override void LoadComplete() + { + base.LoadComplete(); + + // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame + HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position) ?? Vector2.Zero; + } + protected override bool OnMouseMove(MouseMoveEvent e) { switch (state) From 2058604ef35c03d01fdc5d92d79197dbeeb1bca5 Mon Sep 17 00:00:00 2001 From: ProgrammaticNajel Date: Sat, 26 Jan 2019 23:10:13 +0800 Subject: [PATCH 6/6] Typo fix --- .../Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs index 07c3132282..a4050f0c31 100644 --- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs +++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs @@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles base.LoadComplete(); // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame - HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position)?? Vector2.Zero; + HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position) ?? Vector2.Zero; } protected override bool OnClick(ClickEvent e)