sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-12 00:57:21 +09:00
Code Issues Packages Projects 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
commit 5dceee2e36
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/API/APIAccess.cs
View File

@ -225,7 +225,7 @@ namespace osu.Game.Online.API
public APIState State public APIState State
{ {
get { return state; } get { return state; }
set private set
{ {
APIState oldState = state; APIState oldState = state;
APIState newState = value; APIState newState = value;

49
osu.Game/Overlays/LoginOverlay.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Overlays.Settings.Sections.General; using osu.Game.Overlays.Settings.Sections.General;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -28,35 +29,43 @@ namespace osu.Game.Overlays
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.6f,
},
new OsuContextMenuContainer new OsuContextMenuContainer
{ {
Width = 360, Width = 360,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Masking = true,
AutoSizeDuration = transition_time,
AutoSizeEasing = Easing.OutQuint,
Children = new Drawable[] Children = new Drawable[]
{ {
settingsSection = new LoginSettings
{
Padding = new MarginPadding(10),
RequestHide = Hide,
},
new Box new Box
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomLeft, Colour = Color4.Black,
Origin = Anchor.BottomLeft, Alpha = 0.6f,
Height = 3,
Colour = colours.Yellow,
Alpha = 1,
}, },
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,
},
}
}
} }
} }
}; };