From 340ddb59cd55e8197c631c05f9d734274ee8a1b7 Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Wed, 22 Mar 2017 08:54:21 -0300 Subject: [PATCH] License headers --- osu.Game/Screens/Play/SongProgress.cs | 2 +- osu.Game/Screens/Play/SongProgressBar.cs | 110 +++++++++++------------ 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs index 261b1d0a9a..54e3cc5730 100644 --- a/osu.Game/Screens/Play/SongProgress.cs +++ b/osu.Game/Screens/Play/SongProgress.cs @@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play public static readonly int GRAPH_HEIGHT = 34; public static readonly Color4 FILL_COLOUR = new Color4(221, 255, 255, 255); public static readonly Color4 GLOW_COLOUR = new Color4(221, 255, 255, 150); - private float progress_transition_duration = 100; + private const float progress_transition_duration = 100; private SongProgressBar progress; private SongProgressGraph graph; diff --git a/osu.Game/Screens/Play/SongProgressBar.cs b/osu.Game/Screens/Play/SongProgressBar.cs index dc3a761742..aa0e2a4bb0 100644 --- a/osu.Game/Screens/Play/SongProgressBar.cs +++ b/osu.Game/Screens/Play/SongProgressBar.cs @@ -1,66 +1,66 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using OpenTK; +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using OpenTK; using OpenTK.Graphics; -using osu.Game.Overlays; -using osu.Framework.Graphics.Containers; +using osu.Game.Overlays; +using osu.Framework.Graphics.Containers; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Primitives; -namespace osu.Game.Screens.Play -{ - public class SongProgressBar : DragBar - { - public static readonly Vector2 HANDLE_SIZE = new Vector2(14, 25); - - private Container handle; - - public SongProgressBar() - { - Fill.Colour = SongProgress.FILL_COLOUR; - Height = SongProgress.BAR_HEIGHT; - - Add(new Box - { - RelativeSizeAxes = Axes.Both, - Colour = Color4.Black, - Alpha = 0.5f, - Depth = 1 - }); +namespace osu.Game.Screens.Play +{ + public class SongProgressBar : DragBar + { + public static readonly Vector2 HANDLE_SIZE = new Vector2(14, 25); + + private Container handle; + + public SongProgressBar() + { + Fill.Colour = SongProgress.FILL_COLOUR; + Height = SongProgress.BAR_HEIGHT; + + Add(new Box + { + RelativeSizeAxes = Axes.Both, + Colour = Color4.Black, + Alpha = 0.5f, + Depth = 1 + }); FillContainer.Add(handle = new Container { Origin = Anchor.BottomRight, Anchor = Anchor.BottomRight, Width = 2, - Height = SongProgress.BAR_HEIGHT + SongProgress.GRAPH_HEIGHT, - Colour = Color4.White, + Height = SongProgress.BAR_HEIGHT + SongProgress.GRAPH_HEIGHT, + Colour = Color4.White, Position = new Vector2(2, 0), - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - }, - new Container - { - Origin = Anchor.BottomCentre, - Anchor = Anchor.TopCentre, - Size = HANDLE_SIZE, - CornerRadius = 5, - Masking = true, - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - Colour = Color4.White - } - } - } - } - }); - } - } -} + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + }, + new Container + { + Origin = Anchor.BottomCentre, + Anchor = Anchor.TopCentre, + Size = HANDLE_SIZE, + CornerRadius = 5, + Masking = true, + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = Color4.White + } + } + } + } + }); + } + } +}