h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 16:27:26 +08:00
Code Issues Releases Wiki Activity

Update framework (and fix non-conforming anchors in FillFlowContainers).

Browse Source
This commit is contained in:
Dean Herbert 2017-03-04 23:24:13 +09:00
parent a2317e5a1e
commit 00fdffe9c8
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit a0be700a68bfb75bb27350cc7fe2e7e758b8645c
Subproject commit 288236eaba95dfa15268a55f38c009a97d806f25

2
osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
View File

@ -95,8 +95,6 @@ namespace osu.Game.Beatmaps.Drawables
new DifficultyIcon(beatmap)
{
Scale = new Vector2(1.8f),
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
},
new FillFlowContainer
{

18
osu.Game/Overlays/Options/Sections/MaintenanceSection.cs
View File

@ -39,12 +39,20 @@ namespace osu.Game.Overlays.Options.Sections
RelativeSizeAxes = Axes.X,
Text = "Run osu! updater",
},
new OptionLabel
new Container
{
Text = "TODO: osu version here",
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
},
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new[]
{
new OptionLabel
{
Text = "osu!lazer",
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
},
}
}
};
}
}

13
osu.Game/Screens/Play/PauseOverlay.cs
View File

@ -113,11 +113,12 @@ namespace osu.Game.Screens.Play
{
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 20),
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 20),
Children = new Drawable[]
{
new OsuSpriteText
@ -144,6 +145,8 @@ namespace osu.Game.Screens.Play
},
new FillFlowContainer
{
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Masking = true,
@ -188,9 +191,9 @@ namespace osu.Game.Screens.Play
},
retryCounterContainer = new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre
Anchor = Anchor.TopCentre,
AutoSizeAxes = Axes.Both,
}
}
},

6
osu.Game/Screens/Select/FilterControl.cs
View File

@ -210,10 +210,9 @@ namespace osu.Game.Screens.Select
groupsEllipsis = new TextAwesome
{
Icon = FontAwesome.fa_ellipsis_h,
Origin = Anchor.TopLeft,
TextSize = 14,
Margin = new MarginPadding { Top = 5, Bottom = 5 },
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
}
}
},
@ -241,10 +240,9 @@ namespace osu.Game.Screens.Select
sortEllipsis = new TextAwesome
{
Icon = FontAwesome.fa_ellipsis_h,
Origin = Anchor.TopLeft,
TextSize = 14,
Margin = new MarginPadding { Top = 5, Bottom = 5 },
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
}
}
},