h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:52:57 +08:00
Code Issues Releases Wiki Activity

Reduce width of right toolbar ever so slightly (and use more shared constants)

Browse Source
This commit is contained in:
Dean Herbert 2023-07-21 14:39:15 +09:00
parent 870f3e324a
commit f489dbd7a9
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -472,7 +472,7 @@ namespace osu.Game.Rulesets.Edit
public abstract partial class HitObjectComposer : CompositeDrawable, IPositionSnapProvider public abstract partial class HitObjectComposer : CompositeDrawable, IPositionSnapProvider
{ {
public const float TOOLBOX_CONTRACTED_SIZE_LEFT = 60; public const float TOOLBOX_CONTRACTED_SIZE_LEFT = 60;
public const float TOOLBOX_CONTRACTED_SIZE_RIGHT = 130; public const float TOOLBOX_CONTRACTED_SIZE_RIGHT = 120;
public readonly Ruleset Ruleset; public readonly Ruleset Ruleset;

4
osu.Game/Screens/Edit/BottomBar.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects; using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Rulesets.Edit;
using osu.Game.Screens.Edit.Components; using osu.Game.Screens.Edit.Components;
using osu.Game.Screens.Edit.Components.Timelines.Summary; using osu.Game.Screens.Edit.Components.Timelines.Summary;
using osuTK; using osuTK;
@ -57,7 +58,7 @@ namespace osu.Game.Screens.Edit
new Dimension(GridSizeMode.Absolute, 170), new Dimension(GridSizeMode.Absolute, 170),
new Dimension(), new Dimension(),
new Dimension(GridSizeMode.Absolute, 220), new Dimension(GridSizeMode.Absolute, 220),
new Dimension(GridSizeMode.Absolute, 140), new Dimension(GridSizeMode.Absolute, HitObjectComposer.TOOLBOX_CONTRACTED_SIZE_RIGHT),
}, },
Content = new[] Content = new[]
{ {
@ -69,7 +70,6 @@ namespace osu.Game.Screens.Edit
TestGameplayButton = new TestGameplayButton TestGameplayButton = new TestGameplayButton
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Left = 10 },
Size = new Vector2(1), Size = new Vector2(1),
Action = editor.TestGameplay, Action = editor.TestGameplay,
} }

9
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
View File

@ -11,6 +11,7 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Localisation; using osu.Game.Localisation;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Resources.Localisation.Web; using osu.Game.Resources.Localisation.Web;
using osu.Game.Rulesets.Edit;
using osuTK; using osuTK;
namespace osu.Game.Screens.Edit.Compose.Components.Timeline namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@ -36,6 +37,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
OsuCheckbox controlPointsCheckbox; OsuCheckbox controlPointsCheckbox;
OsuCheckbox ticksCheckbox; OsuCheckbox ticksCheckbox;
const float padding = 10;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new GridContainer new GridContainer
@ -51,7 +54,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
new Dimension(GridSizeMode.Absolute, 140), new Dimension(GridSizeMode.Absolute, 140),
new Dimension(), new Dimension(),
new Dimension(GridSizeMode.Absolute, 35), new Dimension(GridSizeMode.Absolute, 35),
new Dimension(GridSizeMode.Absolute, 110), new Dimension(GridSizeMode.Absolute, HitObjectComposer.TOOLBOX_CONTRACTED_SIZE_RIGHT - padding * 2),
}, },
Content = new[] Content = new[]
{ {
@ -71,7 +74,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
new FillFlowContainer new FillFlowContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(10), Padding = new MarginPadding(padding),
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 4), Spacing = new Vector2(0, 4),
Children = new[] Children = new[]
@ -124,7 +127,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Name = @"Zoom controls", Name = @"Zoom controls",
Padding = new MarginPadding { Right = 10 }, Padding = new MarginPadding { Right = padding },
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box