h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-18 03:33:39 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-invisible-marker

Browse Source
This commit is contained in:
Dan Balasescu
2017-09-27 14:53:58 +09:00
committed by GitHub
Unverified
parent 43d56bc9d7 5a3abadfe1
commit 5dceee2e36
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Online/API/APIAccess.cs
+1 -1
View File
@@ -225,7 +225,7 @@ namespace osu.Game.Online.API
public APIState State
{
get { return state; }
set
private set
{
APIState oldState = state;
APIState newState = value;
osu.Game/Overlays/LoginOverlay.cs
+29 -20
View File
@@ -3,6 +3,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Overlays.Settings.Sections.General;
using OpenTK.Graphics;
@@ -28,35 +29,43 @@ namespace osu.Game.Overlays
{
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.6f,
},
new OsuContextMenuContainer
{
Width = 360,
AutoSizeAxes = Axes.Y,
Masking = true,
AutoSizeDuration = transition_time,
AutoSizeEasing = Easing.OutQuint,
Children = new Drawable[]
{
settingsSection = new LoginSettings
{
Padding = new MarginPadding(10),
RequestHide = Hide,
},
new Box
{
RelativeSizeAxes = Axes.X,
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Height = 3,
Colour = colours.Yellow,
Alpha = 1,
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.6f,
},
new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Masking = true,
AutoSizeDuration = transition_time,
AutoSizeEasing = Easing.OutQuint,
Children = new Drawable[]
{
settingsSection = new LoginSettings
{
Padding = new MarginPadding(10),
RequestHide = Hide,
},
new Box
{
RelativeSizeAxes = Axes.X,
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Height = 3,
Colour = colours.Yellow,
Alpha = 1,
},
}
}
}
}
};