RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 03:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #315 from Tom94/better-visibility

Browse Source 
Better visibility
This commit is contained in:
Dean Herbert 2017-02-05 23:39:02 +09:00 committed by GitHub
commit 65feda0505
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit a642501e72bb0c062835e75151eac45df1ad481d
Subproject commit f4362fce5a891e8b8dd84fadc0a9743a8c92e030

5
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -115,8 +115,9 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
base.UpdateInitialState();
body.Alpha = 1;
//we need to be visible to handle input events. note that we still don't get enough events (we don't get a position if the mouse hasn't moved since the slider appeared).
ball.Alpha = 0.01f;
//we need to be present to handle input events. note that we still don't get enough events (we don't get a position if the mouse hasn't moved since the slider appeared).
ball.AlwaysPresent = true;
ball.Alpha = 0;
}
protected override void UpdateState(ArmedState state)

6
osu.Game/Graphics/Cursor/OsuCursorContainer.cs
View File

@ -72,7 +72,8 @@ namespace osu.Game.Graphics.Cursor
new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0.01f,
Alpha = 0,
AlwaysPresent = true,
},
new CircularContainer
{
@ -87,7 +88,8 @@ namespace osu.Game.Graphics.Cursor
new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0.01f,
Alpha = 0,
AlwaysPresent = true,
},
},
},

3
osu.Game/Graphics/UserInterface/Nub.cs
View File

@ -39,7 +39,8 @@ namespace osu.Game.Graphics.UserInterface
fill = new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0.01f,
Alpha = 0,
AlwaysPresent = true,
},
};
}

2
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
public void Adjust(InputState state)
{
if (!IsVisible)
if (State == Visibility.Hidden)
{
Show();
return;

2
osu.Game/Screens/Select/CarouselContainer.cs
View File

@ -202,7 +202,7 @@ namespace osu.Game.Screens.Select
/// <param name="halfHeight">Half the draw height of the carousel container.</param>
private void updatePanel(Panel p, float halfHeight)
{
var height = p.IsVisible ? p.DrawHeight : 0;
var height = p.IsPresent ? p.DrawHeight : 0;
float panelDrawY = p.Position.Y - Current + height / 2;
float dist = Math.Abs(1f - panelDrawY / halfHeight);