1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 03:55:30 +08:00

Merge branch 'master' into taiko_scoreprocessing

This commit is contained in:
Dean Herbert 2017-03-24 12:25:19 +09:00 committed by GitHub
commit cb0c7dca71
6 changed files with 37 additions and 9 deletions

@ -1 +1 @@
Subproject commit 34c9f17a6ac6fa5e9fd5569f9e119331316c1313 Subproject commit 51737ec1320b4ea9dce4978f24e1d77a28f0a98e

View File

@ -12,7 +12,7 @@ using osu.Framework.Configuration;
namespace osu.Game.Graphics.Containers namespace osu.Game.Graphics.Containers
{ {
internal class ParallaxContainer : Container internal class ParallaxContainer : Container, IRequireHighFrequencyMousePosition
{ {
public float ParallaxAmount = 0.02f; public float ParallaxAmount = 0.02f;

View File

@ -22,6 +22,8 @@ namespace osu.Game.Screens.Select
private const float play_song_select_button_width = 100; private const float play_song_select_button_width = 100;
private const float play_song_select_button_height = 50; private const float play_song_select_button_height = 50;
public const float HEIGHT = 50;
public const int TRANSITION_LENGTH = 300; public const int TRANSITION_LENGTH = 300;
private const float padding = 80; private const float padding = 80;
@ -69,10 +71,8 @@ namespace osu.Game.Screens.Select
{ {
AlwaysReceiveInput = true; AlwaysReceiveInput = true;
const float bottom_tool_height = 50;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = bottom_tool_height; Height = HEIGHT;
Anchor = Anchor.BottomCentre; Anchor = Anchor.BottomCentre;
Origin = Anchor.BottomCentre; Origin = Anchor.BottomCentre;
Children = new Drawable[] Children = new Drawable[]

View File

@ -4,6 +4,7 @@
using OpenTK.Input; using OpenTK.Input;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
@ -22,12 +23,11 @@ namespace osu.Game.Screens.Select
public PlaySongSelect() public PlaySongSelect()
{ {
Add(modSelect = new ModSelectOverlay FooterPanels.Add(modSelect = new ModSelectOverlay
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Margin = new MarginPadding { Bottom = 50 }
}); });
LeftContent.Add(beatmapDetails = new BeatmapDetailArea LeftContent.Add(beatmapDetails = new BeatmapDetailArea
@ -66,6 +66,17 @@ namespace osu.Game.Screens.Select
base.OnResuming(last); base.OnResuming(last);
} }
protected override bool OnExiting(Screen next)
{
if (modSelect.State == Visibility.Visible)
{
modSelect.Hide();
return true;
}
return base.OnExiting(next);
}
protected override void OnSelected() protected override void OnSelected()
{ {
if (player != null) return; if (player != null) return;

View File

@ -65,6 +65,12 @@ namespace osu.Game.Screens.Select
/// </summary> /// </summary>
protected readonly Footer Footer; protected readonly Footer Footer;
/// <summary>
/// Contains any panel which is triggered by a footer button.
/// Helps keep them located beneath the footer itself.
/// </summary>
protected readonly Container FooterPanels;
public readonly FilterControl FilterControl; public readonly FilterControl FilterControl;
protected SongSelect() protected SongSelect()
@ -131,11 +137,15 @@ namespace osu.Game.Screens.Select
if (ShowFooter) if (ShowFooter)
{ {
Add(BeatmapOptions = new BeatmapOptionsOverlay Add(FooterPanels = new Container
{ {
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding Margin = new MarginPadding
{ {
Bottom = 50, Bottom = Footer.HEIGHT,
}, },
}); });
Add(Footer = new Footer Add(Footer = new Footer
@ -143,6 +153,8 @@ namespace osu.Game.Screens.Select
OnBack = Exit, OnBack = Exit,
OnStart = raiseSelect, OnStart = raiseSelect,
}); });
FooterPanels.Add(BeatmapOptions = new BeatmapOptionsOverlay());
} }
} }

View File

@ -1,4 +1,9 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ewav/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=D9A367C9_002D4C1A_002D489F_002D9B05_002DA0CEA2B53B58/@EntryIndexedValue">ExplicitlyExcluded</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>