sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into musiccontroller-canbeatmapchange

Browse Source
This commit is contained in:
MrTheMake
2017-06-24 12:26:40 +02:00
committed by GitHub
parent 3b2df5fa0f f70bdd80aa
commit cc71c10488
49 changed files with 1068 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Containers/ParallaxContainer.cs
View File

@ -19,8 +19,6 @@ namespace osu.Game.Graphics.Containers
public ParallaxContainer()
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
AddInternal(content = new Container
{

3
osu.Game/Graphics/Cursor/CursorTrail.cs
View File

@ -65,7 +65,6 @@ namespace osu.Game.Graphics.Cursor
// as we are currently very dependent on having a running clock, let's make our own clock for the time being.
Clock = new FramedClock();
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
for (int i = 0; i < max_sprites; i++)
@ -75,6 +74,8 @@ namespace osu.Game.Graphics.Cursor
}
}
public override bool Contains(Vector2 screenSpacePos) => true;
[BackgroundDependencyLoader]
private void load(ShaderManager shaders, TextureStore textures)
{

1
osu.Game/Graphics/Processing/RatioAdjust.cs
View File

@ -12,7 +12,6 @@ namespace osu.Game.Graphics.Processing
{
public RatioAdjust()
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
}

2
osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Graphics.UserInterface
public readonly TextAwesome Chevron;
//don't allow clicking between transitions and don't make the chevron clickable
protected override bool InternalContains(Vector2 screenSpacePos) => Alpha == 1f && Text.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => Alpha == 1f && Text.Contains(screenSpacePos);
public override bool HandleInput => State == Visibility.Visible;
private Visibility state;

2
osu.Game/Graphics/UserInterface/DialogButton.cs
View File

@ -93,7 +93,7 @@ namespace osu.Game.Graphics.UserInterface
private bool didClick; // Used for making sure that the OnMouseDown animation can call instead of OnHoverLost's when clicking
protected override bool InternalContains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos);
protected override bool OnClick(Framework.Input.InputState state)
{

2
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Graphics.UserInterface
protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem(value);
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
private bool isEnumType => typeof(T).IsEnum;

6
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
View File

@ -63,8 +63,12 @@ namespace osu.Game.Graphics.UserInterface
X = (value & Anchor.x2) > 0 ? SIZE_RETRACTED.X * shear * 0.5f : 0;
Remove(c1);
Remove(c2);
c1.Depth = (value & Anchor.x2) > 0 ? 0 : 1;
c2.Depth = (value & Anchor.x2) > 0 ? 1 : 0;
Add(c1);
Add(c2);
}
}
@ -167,7 +171,7 @@ namespace osu.Game.Graphics.UserInterface
}
}
protected override bool InternalContains(Vector2 screenSpacePos) => IconLayer.Contains(screenSpacePos) || TextLayer.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => IconLayer.Contains(screenSpacePos) || TextLayer.Contains(screenSpacePos);
protected override bool OnHover(InputState state)
{