mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 10:52:53 +08:00
Remove now unused files
This commit is contained in:
parent
34f3672750
commit
10c1823534
@ -2,14 +2,13 @@
|
|||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using osuTK.Graphics;
|
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.UserInterface;
|
using osu.Framework.Graphics.UserInterface;
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
using osuTK;
|
using osuTK;
|
||||||
|
using osuTK.Graphics;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.SearchableList
|
namespace osu.Game.Graphics.UserInterface
|
||||||
{
|
{
|
||||||
public class SlimEnumDropdown<T> : OsuEnumDropdown<T>
|
public class SlimEnumDropdown<T> : OsuEnumDropdown<T>
|
||||||
where T : struct, Enum
|
where T : struct, Enum
|
@ -1,84 +0,0 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
|
||||||
|
|
||||||
using osu.Framework.Bindables;
|
|
||||||
using osuTK;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Framework.Graphics.Sprites;
|
|
||||||
using osu.Game.Graphics.Containers;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.SearchableList
|
|
||||||
{
|
|
||||||
public class DisplayStyleControl : CompositeDrawable
|
|
||||||
{
|
|
||||||
public readonly Bindable<PanelDisplayStyle> DisplayStyle = new Bindable<PanelDisplayStyle>();
|
|
||||||
|
|
||||||
public DisplayStyleControl()
|
|
||||||
{
|
|
||||||
AutoSizeAxes = Axes.Both;
|
|
||||||
|
|
||||||
InternalChild = new FillFlowContainer
|
|
||||||
{
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Spacing = new Vector2(5f, 0f),
|
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
Children = new[]
|
|
||||||
{
|
|
||||||
new DisplayStyleToggleButton(FontAwesome.Solid.ThLarge, PanelDisplayStyle.Grid, DisplayStyle),
|
|
||||||
new DisplayStyleToggleButton(FontAwesome.Solid.ListUl, PanelDisplayStyle.List, DisplayStyle),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
DisplayStyle.Value = PanelDisplayStyle.Grid;
|
|
||||||
}
|
|
||||||
|
|
||||||
private class DisplayStyleToggleButton : OsuClickableContainer
|
|
||||||
{
|
|
||||||
private readonly SpriteIcon icon;
|
|
||||||
private readonly PanelDisplayStyle style;
|
|
||||||
private readonly Bindable<PanelDisplayStyle> bindable;
|
|
||||||
|
|
||||||
public DisplayStyleToggleButton(IconUsage icon, PanelDisplayStyle style, Bindable<PanelDisplayStyle> bindable)
|
|
||||||
{
|
|
||||||
this.bindable = bindable;
|
|
||||||
this.style = style;
|
|
||||||
Size = new Vector2(25f);
|
|
||||||
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
this.icon = new SpriteIcon
|
|
||||||
{
|
|
||||||
Anchor = Anchor.Centre,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
Icon = icon,
|
|
||||||
Size = new Vector2(18),
|
|
||||||
Alpha = 0.5f,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
bindable.ValueChanged += Bindable_ValueChanged;
|
|
||||||
Bindable_ValueChanged(new ValueChangedEvent<PanelDisplayStyle>(bindable.Value, bindable.Value));
|
|
||||||
Action = () => bindable.Value = this.style;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Bindable_ValueChanged(ValueChangedEvent<PanelDisplayStyle> e)
|
|
||||||
{
|
|
||||||
icon.FadeTo(e.NewValue == style ? 1.0f : 0.5f, 100);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Dispose(bool isDisposing)
|
|
||||||
{
|
|
||||||
base.Dispose(isDisposing);
|
|
||||||
|
|
||||||
bindable.ValueChanged -= Bindable_ValueChanged;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum PanelDisplayStyle
|
|
||||||
{
|
|
||||||
Grid,
|
|
||||||
List,
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,29 +0,0 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
|
||||||
|
|
||||||
using osuTK.Graphics;
|
|
||||||
using osu.Framework.Graphics.UserInterface;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.SearchableList
|
|
||||||
{
|
|
||||||
public class HeaderTabControl<T> : OsuTabControl<T>
|
|
||||||
{
|
|
||||||
protected override TabItem<T> CreateTabItem(T value) => new HeaderTabItem(value);
|
|
||||||
|
|
||||||
public HeaderTabControl()
|
|
||||||
{
|
|
||||||
Height = 26;
|
|
||||||
AccentColour = Color4.White;
|
|
||||||
}
|
|
||||||
|
|
||||||
private class HeaderTabItem : OsuTabItem
|
|
||||||
{
|
|
||||||
public HeaderTabItem(T value)
|
|
||||||
: base(value)
|
|
||||||
{
|
|
||||||
Text.Font = Text.Font.With(size: 16);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,165 +0,0 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using osuTK.Graphics;
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Game.Graphics;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
using osu.Framework.Graphics.Shapes;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.SearchableList
|
|
||||||
{
|
|
||||||
public abstract class SearchableListFilterControl<TTab, TCategory> : Container
|
|
||||||
where TTab : struct, Enum
|
|
||||||
where TCategory : struct, Enum
|
|
||||||
{
|
|
||||||
private const float padding = 10;
|
|
||||||
|
|
||||||
private readonly Drawable filterContainer;
|
|
||||||
private readonly Drawable rightFilterContainer;
|
|
||||||
private readonly Box tabStrip;
|
|
||||||
|
|
||||||
public readonly SearchTextBox Search;
|
|
||||||
public readonly PageTabControl<TTab> Tabs;
|
|
||||||
public readonly SlimEnumDropdown<TCategory> Dropdown;
|
|
||||||
public readonly DisplayStyleControl DisplayStyleControl;
|
|
||||||
|
|
||||||
protected abstract Color4 BackgroundColour { get; }
|
|
||||||
protected abstract TTab DefaultTab { get; }
|
|
||||||
protected abstract TCategory DefaultCategory { get; }
|
|
||||||
protected virtual Drawable CreateSupplementaryControls() => null;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The amount of padding added to content (does not affect background or tab control strip).
|
|
||||||
/// </summary>
|
|
||||||
protected virtual float ContentHorizontalPadding => WaveOverlayContainer.WIDTH_PADDING;
|
|
||||||
|
|
||||||
protected SearchableListFilterControl()
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X;
|
|
||||||
|
|
||||||
var controls = CreateSupplementaryControls();
|
|
||||||
Container controlsContainer;
|
|
||||||
Children = new[]
|
|
||||||
{
|
|
||||||
filterContainer = new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new Box
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Colour = BackgroundColour,
|
|
||||||
Alpha = 0.9f,
|
|
||||||
},
|
|
||||||
tabStrip = new Box
|
|
||||||
{
|
|
||||||
Anchor = Anchor.BottomLeft,
|
|
||||||
Origin = Anchor.BottomLeft,
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Height = 1,
|
|
||||||
},
|
|
||||||
new FillFlowContainer
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Padding = new MarginPadding
|
|
||||||
{
|
|
||||||
Top = padding,
|
|
||||||
Horizontal = ContentHorizontalPadding
|
|
||||||
},
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
Search = new FilterSearchTextBox
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
},
|
|
||||||
controlsContainer = new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Margin = new MarginPadding { Top = controls != null ? padding : 0 },
|
|
||||||
},
|
|
||||||
new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Padding = new MarginPadding { Right = 225 },
|
|
||||||
Child = Tabs = new PageTabControl<TTab>
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
new Box // keep the tab strip part of autosize, but don't put it in the flow container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Height = 1,
|
|
||||||
Colour = Color4.White.Opacity(0),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
rightFilterContainer = new FillFlowContainer
|
|
||||||
{
|
|
||||||
Anchor = Anchor.TopRight,
|
|
||||||
Origin = Anchor.TopRight,
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
Dropdown = new SlimEnumDropdown<TCategory>
|
|
||||||
{
|
|
||||||
Anchor = Anchor.TopRight,
|
|
||||||
Origin = Anchor.TopRight,
|
|
||||||
RelativeSizeAxes = Axes.None,
|
|
||||||
Width = 160f,
|
|
||||||
},
|
|
||||||
DisplayStyleControl = new DisplayStyleControl
|
|
||||||
{
|
|
||||||
Anchor = Anchor.TopRight,
|
|
||||||
Origin = Anchor.TopRight,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (controls != null) controlsContainer.Children = new[] { controls };
|
|
||||||
|
|
||||||
Tabs.Current.Value = DefaultTab;
|
|
||||||
Tabs.Current.TriggerChange();
|
|
||||||
|
|
||||||
Dropdown.Current.Value = DefaultCategory;
|
|
||||||
Dropdown.Current.TriggerChange();
|
|
||||||
}
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuColour colours)
|
|
||||||
{
|
|
||||||
tabStrip.Colour = colours.Yellow;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Update()
|
|
||||||
{
|
|
||||||
base.Update();
|
|
||||||
|
|
||||||
Height = filterContainer.Height;
|
|
||||||
rightFilterContainer.Margin = new MarginPadding { Top = filterContainer.Height - 30, Right = ContentHorizontalPadding };
|
|
||||||
}
|
|
||||||
|
|
||||||
private class FilterSearchTextBox : SearchTextBox
|
|
||||||
{
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load()
|
|
||||||
{
|
|
||||||
BackgroundUnfocused = OsuColour.Gray(0.06f);
|
|
||||||
BackgroundFocused = OsuColour.Gray(0.12f);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.UserInterface;
|
using osu.Framework.Graphics.UserInterface;
|
||||||
using osu.Game.Overlays.SearchableList;
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
|
||||||
namespace osu.Game.Screens.Multi.Lounge.Components
|
namespace osu.Game.Screens.Multi.Lounge.Components
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user