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

Update framework

Browse Source
This commit is contained in:
Thomas Müller
2017-02-25 13:12:39 +01:00
committed by Dean Herbert
parent 6a67ffa5b3
commit 1585ae842a
68 changed files with 75 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Graphics.UserInterface
@ -55,7 +55,7 @@ namespace osu.Game.Graphics.UserInterface
Roundness = 8,
};
FadeGlowTo(0);
FadeEdgeEffectTo(0);
}
public bool Glowing
@ -65,11 +65,11 @@ namespace osu.Game.Graphics.UserInterface
if (value)
{
FadeColour(glowingColour, 500, EasingTypes.OutQuint);
FadeGlowTo(1, 500, EasingTypes.OutQuint);
FadeEdgeEffectTo(1, 500, EasingTypes.OutQuint);
}
else
{
FadeGlowTo(0, 500);
FadeEdgeEffectTo(0, 500);
FadeColour(idleColour, 500);
}
}

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

@ -5,7 +5,7 @@ using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input;
using osu.Game.Graphics.Backgrounds;

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

@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;

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

@ -4,7 +4,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using OpenTK;
using OpenTK.Graphics;

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

@ -8,7 +8,7 @@ using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input;

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

@ -2,7 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using System;
namespace osu.Game.Graphics.UserInterface

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

@ -4,7 +4,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using System;
using System.Collections.Generic;
using System.Diagnostics;

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

@ -2,7 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using System;

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

@ -4,7 +4,7 @@
using OpenTK;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using System;
@ -113,7 +113,7 @@ namespace osu.Game.Graphics.UserInterface
int i = 0;
foreach (var star in stars.Children)
{
star.ClearTransformations(true);
star.ClearTransforms(true);
star.FadeTo(i < count ? 1.0f : minStarAlpha);
star.Icon.ScaleTo(getStarScale(i, count));
i++;
@ -133,7 +133,7 @@ namespace osu.Game.Graphics.UserInterface
int i = 0;
foreach (var star in stars.Children)
{
star.ClearTransformations(true);
star.ClearTransforms(true);
if (count <= newValue)
star.Delay(Math.Max(i - count, 0) * animationDelay, true);
else

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

@ -6,7 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Input;
using OpenTK;
using OpenTK.Graphics;
@ -164,7 +164,7 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(InputState state)
{
icon.ClearTransformations();
icon.ClearTransforms();
ResizeTo(SIZE_EXTENDED, transform_time, EasingTypes.OutElastic);
@ -193,7 +193,7 @@ namespace osu.Game.Graphics.UserInterface
protected override void OnHoverLost(InputState state)
{
icon.ClearTransformations();
icon.ClearTransforms();
ResizeTo(SIZE_RETRACTED, transform_time, EasingTypes.OutElastic);

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

@ -94,7 +94,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
protected override void PopIn()
{
ClearTransformations();
ClearTransforms();
FadeIn(100);
schedulePopOut();

1
osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using OpenTK.Input;

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

@ -5,7 +5,7 @@ using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Input;
using osu.Game.Graphics.Sprites;
using OpenTK;