h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 00:42:55 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Tom94/general-improvements' into general-fixes

Browse Source
This commit is contained in:
Dean Herbert 2016-10-19 12:22:16 +09:00
commit 6705902710
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/GameModes/BackgroundMode.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.GameModes
{
base.Load(game);
Content.Scale *= 1 + (x_movement_amount / Size.X) * 2;
Content.Scale *= 1 + (x_movement_amount / DrawSize.X) * 2;
}
protected override void OnEntering(GameMode last)

6
osu.Game/GameModes/GameModeWhiteBox.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.GameModes
popButton.Alpha = 1;
Content.Alpha = 0;
textContainer.Position = new Vector2(Size.X / 16, 0);
textContainer.Position = new Vector2(DrawSize.X / 16, 0);
box.ScaleTo(0.2f);
box.RotateTo(-20);
@ -55,7 +55,7 @@ namespace osu.Game.GameModes
protected override bool OnExiting(GameMode next)
{
textContainer.MoveTo(new Vector2((Size.X / 16), 0), transition_time, EasingTypes.OutExpo);
textContainer.MoveTo(new Vector2((DrawSize.X / 16), 0), transition_time, EasingTypes.OutExpo);
Content.FadeOut(transition_time, EasingTypes.OutExpo);
return base.OnExiting(next);
@ -65,7 +65,7 @@ namespace osu.Game.GameModes
{
base.OnSuspending(next);
textContainer.MoveTo(new Vector2(-(Size.X / 16), 0), transition_time, EasingTypes.OutExpo);
textContainer.MoveTo(new Vector2(-(DrawSize.X / 16), 0), transition_time, EasingTypes.OutExpo);
Content.FadeOut(transition_time, EasingTypes.OutExpo);
}

2
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -210,7 +210,7 @@ namespace osu.Game.GameModes.Menu
case MenuState.TopLevel:
buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out);
osuLogo.MoveTo(buttonFlow.Position, 200, EasingTypes.In);
osuLogo.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
osuLogo.ScaleTo(0.5f, 200, EasingTypes.In);
buttonArea.FadeIn(300);

2
osu.Game/GameModes/Menu/FlowContainerWithOrigin.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.GameModes.Menu
if (CentreTarget == null)
return base.OriginPosition;
return CentreTarget.Position + CentreTarget.Size / 2;
return CentreTarget.DrawPosition + CentreTarget.DrawSize / 2;
}
}
}

2
osu.Game/GameModes/Menu/OsuLogo.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.GameModes.Menu
public Action Action;
public float SizeForFlow => logo == null ? 0 : logo.Size.X * logo.Scale.X * logoBounceContainer.Scale.X * 0.8f;
public float SizeForFlow => logo == null ? 0 : logo.DrawSize.X * logo.Scale.X * logoBounceContainer.Scale.X * 0.8f;
private Sprite ripple;

2
osu.Game/Graphics/Background/Background.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Graphics.Background
protected override void Update()
{
base.Update();
BackgroundSprite.Scale = new Vector2(Math.Max(Size.X / BackgroundSprite.Size.X, Size.Y / BackgroundSprite.Size.Y));
BackgroundSprite.Scale = new Vector2(Math.Max(DrawSize.X / BackgroundSprite.DrawSize.X, DrawSize.Y / BackgroundSprite.DrawSize.Y));
}
}
}

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

@ -34,7 +34,7 @@ namespace osu.Game.Graphics.Containers
protected override bool OnMouseMove(InputState state)
{
content.Position = (state.Mouse.Position - Size / 2) * ParallaxAmount;
content.Position = (state.Mouse.Position - DrawSize / 2) * ParallaxAmount;
return base.OnMouseMove(state);
}

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

@ -20,7 +20,7 @@ namespace osu.Game.Graphics.Processing
protected override void Update()
{
base.Update();
Vector2 parent = Parent.Size;
Vector2 parent = Parent.DrawSize;
Scale = new Vector2(Math.Min(parent.Y / 768f, parent.X / 1024f));
Size = new Vector2(1 / Scale.X);

4
osu.Game/Graphics/UserInterface/KeyCounter.cs
View File

@ -107,8 +107,8 @@ namespace osu.Game.Graphics.UserInterface
};
//Set this manually because an element with Alpha=0 won't take it size to AutoSizeContainer,
//so the size can be changing between buttonSprite and glowSprite.
Height = buttonSprite.Height;
Width = buttonSprite.Width;
Height = buttonSprite.DrawHeight;
Width = buttonSprite.DrawWidth;
}
private void updateGlowSprite(bool show)

2
osu.Game/Overlays/ChatConsole.cs
View File

@ -144,7 +144,7 @@ namespace osu.Game.Overlays
protected override void PopOut()
{
MoveToY(-Size.Y, transition_length, EasingTypes.InQuint);
MoveToY(-DrawSize.Y, transition_length, EasingTypes.InQuint);
FadeOut(transition_length, EasingTypes.InQuint);
}
}

2
osu.Game/Overlays/Toolbar.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Overlays
protected override void PopOut()
{
MoveToY(-Size.Y, transition_time, EasingTypes.InQuint);
MoveToY(-DrawSize.Y, transition_time, EasingTypes.InQuint);
FadeOut(transition_time, EasingTypes.InQuint);
}

2
osu.Game/Overlays/ToolbarButton.cs
View File

@ -121,7 +121,7 @@ namespace osu.Game.Overlays
base.Update();
//todo: find a way to avoid using this (autosize needs to be able to ignore certain drawables.. in this case the tooltip)
Size = new Vector2(WIDTH + (DrawableText.IsVisible ? DrawableText.Size.X : 0), 1);
Size = new Vector2(WIDTH + (DrawableText.IsVisible ? DrawableText.DrawSize.X : 0), 1);
}
protected override bool OnClick(InputState state)

2
osu.Game/Overlays/ToolbarModeSelector.cs
View File

@ -96,7 +96,7 @@ namespace osu.Game.Overlays
base.UpdateLayout();
if (!activeMode.EnsureValid())
activeMode.Refresh(() => modeButtonLine.MoveToX(activeButton.Position.X + activeButton.Size.X / 2 + padding, 200, EasingTypes.OutQuint));
activeMode.Refresh(() => modeButtonLine.MoveToX(activeButton.DrawPosition.X + activeButton.DrawSize.X / 2 + padding, 200, EasingTypes.OutQuint));
}
}
}