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

Merge pull request #1735 from Aergwyn/add-nofitication-overlay-push-bg

Browse Source 
Let NotificationOverlay move the background
This commit is contained in:
Dean Herbert 2017-12-25 00:14:44 +09:00 committed by GitHub
commit 45e4c09cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/OsuGame.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game
private MusicController musicController;
private NotificationOverlay notificationOverlay;
private NotificationOverlay notifications;
private DialogOverlay dialogOverlay;
@ -136,7 +136,7 @@ namespace osu.Game
if (s.Beatmap == null)
{
notificationOverlay.Post(new SimpleNotification
notifications.Post(new SimpleNotification
{
Text = @"Tried to load a score for a beatmap we don't have!",
Icon = FontAwesome.fa_life_saver,
@ -154,7 +154,7 @@ namespace osu.Game
base.LoadComplete();
// hook up notifications to components.
BeatmapManager.PostNotification = n => notificationOverlay?.Post(n);
BeatmapManager.PostNotification = n => notifications?.Post(n);
BeatmapManager.GetStableStorage = GetStorageForStableInstall;
AddRange(new Drawable[]
@ -207,7 +207,7 @@ namespace osu.Game
Origin = Anchor.TopRight,
}, overlayContent.Add);
loadComponentSingleFile(notificationOverlay = new NotificationOverlay
loadComponentSingleFile(notifications = new NotificationOverlay
{
GetToolbarHeight = () => ToolbarOffset,
Depth = -4,
@ -224,7 +224,7 @@ namespace osu.Game
{
if (entry.Level < LogLevel.Important) return;
notificationOverlay.Post(new SimpleNotification
notifications.Post(new SimpleNotification
{
Text = $@"{entry.Level}: {entry.Message}"
});
@ -237,7 +237,7 @@ namespace osu.Game
dependencies.Cache(userProfile);
dependencies.Cache(musicController);
dependencies.Cache(beatmapSetOverlay);
dependencies.Cache(notificationOverlay);
dependencies.Cache(notifications);
dependencies.Cache(dialogOverlay);
// ensure only one of these overlays are open at once.
@ -272,19 +272,21 @@ namespace osu.Game
};
}
settings.StateChanged += delegate
Action<Visibility> stateChanged = delegate
{
switch (settings.State)
{
case Visibility.Hidden:
intro.MoveToX(0, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
break;
case Visibility.Visible:
intro.MoveToX(SettingsOverlay.SIDEBAR_WIDTH / 2, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
break;
}
float offset = 0;
if (settings.State == Visibility.Visible)
offset += ToolbarButton.WIDTH / 2;
if (notifications.State == Visibility.Visible)
offset -= ToolbarButton.WIDTH / 2;
intro.MoveToX(offset, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
};
settings.StateChanged += stateChanged;
notifications.StateChanged += stateChanged;
Cursor.State = Visibility.Hidden;
}
@ -352,7 +354,7 @@ namespace osu.Game
direct.State = Visibility.Hidden;
social.State = Visibility.Hidden;
userProfile.State = Visibility.Hidden;
notificationOverlay.State = Visibility.Hidden;
notifications.State = Visibility.Hidden;
}
private void screenChanged(Screen newScreen)

6
osu.Game/Overlays/SettingsOverlay.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Overlays
public const float TRANSITION_LENGTH = 600;
public const float SIDEBAR_WIDTH = Sidebar.DEFAULT_WIDTH;
private const float sidebar_width = Sidebar.DEFAULT_WIDTH;
protected const float WIDTH = 400;
@ -102,7 +102,7 @@ namespace osu.Game.Overlays
if (showSidebar)
{
AddInternal(Sidebar = new Sidebar { Width = SIDEBAR_WIDTH });
AddInternal(Sidebar = new Sidebar { Width = sidebar_width });
SectionsContainer.SelectedSection.ValueChanged += section =>
{
@ -167,7 +167,7 @@ namespace osu.Game.Overlays
ContentContainer.MoveToX(-WIDTH, TRANSITION_LENGTH, Easing.OutQuint);
Sidebar?.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, Easing.OutQuint);
Sidebar?.MoveToX(-sidebar_width, TRANSITION_LENGTH, Easing.OutQuint);
this.FadeTo(0, TRANSITION_LENGTH, Easing.OutQuint);
searchTextBox.HoldFocus = false;