RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-05 13:50:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10138 from peppy/editor-fix-masking

Browse Source 
Fix editor hitobjects getting masked weirdly
This commit is contained in:
Dan Balasescu 2020-09-11 20:57:53 +09:00 committed by GitHub
commit 53fab11321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -82,57 +82,49 @@ namespace osu.Game.Rulesets.Edit
return; return;
} }
InternalChild = new GridContainer const float toolbar_width = 200;
InternalChildren = new Drawable[]
{ {
RelativeSizeAxes = Axes.Both, new Container
Content = new[]
{ {
new Drawable[] Name = "Content",
Padding = new MarginPadding { Left = toolbar_width },
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{ {
new FillFlowContainer // layers below playfield
drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
{ {
Name = "Sidebar", LayerBelowRuleset,
RelativeSizeAxes = Axes.Both, new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
Padding = new MarginPadding { Right = 10 }, }),
Spacing = new Vector2(10), drawableRulesetWrapper,
Children = new Drawable[] // layers above playfield
{ drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()
new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } }, .WithChild(BlueprintContainer = CreateBlueprintContainer(HitObjects))
new ToolboxGroup("toggles") }
{
ChildrenEnumerable = Toggles.Select(b => new SettingsCheckbox
{
Bindable = b,
LabelText = b?.Description ?? "unknown"
})
}
}
},
new Container
{
Name = "Content",
RelativeSizeAxes = Axes.Both,
Masking = true,
Children = new Drawable[]
{
// layers below playfield
drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
{
LayerBelowRuleset,
new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
}),
drawableRulesetWrapper,
// layers above playfield
drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer()
.WithChild(BlueprintContainer = CreateBlueprintContainer(HitObjects))
}
}
},
}, },
ColumnDimensions = new[] new FillFlowContainer
{ {
new Dimension(GridSizeMode.Absolute, 200), Name = "Sidebar",
} RelativeSizeAxes = Axes.Y,
Width = toolbar_width,
Padding = new MarginPadding { Right = 10 },
Spacing = new Vector2(10),
Children = new Drawable[]
{
new ToolboxGroup("toolbox") { Child = toolboxCollection = new RadioButtonCollection { RelativeSizeAxes = Axes.X } },
new ToolboxGroup("toggles")
{
ChildrenEnumerable = Toggles.Select(b => new SettingsCheckbox
{
Bindable = b,
LabelText = b?.Description ?? "unknown"
})
}
}
},
}; };
toolboxCollection.Items = CompositionTools toolboxCollection.Items = CompositionTools