osu/osu-tools
1
0
Fork 0
mirror of https://github.com/ppy/osu-tools.git synced 2025-06-09 09:35:15 +09:00
Code Activity

Update packages, change buttons to RoundedButton

Browse source
This commit is contained in:
StanR 2022-11-30 01:23:18 +03:00
parent 4e67a32422
commit 2edd0e483c
36 changed files with 60 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

12
PerformanceCalculator/PerformanceCalculator.csproj
View file

@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Alba.CsConsoleFormat" Version="1.0.0" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
<PackageReference Include="ppy.osu.Game" Version="2022.927.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2022.927.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2022.927.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2022.927.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2022.927.0" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
<PackageReference Include="ppy.osu.Game" Version="2022.1129.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2022.1129.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2022.1129.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2022.1129.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2022.1129.0" />
</ItemGroup>
</Project>

2
PerformanceCalculatorGUI/Components/BeatmapCard.cs
View file

@ -19,7 +19,7 @@ using PerformanceCalculatorGUI.Components.TextBoxes;
namespace PerformanceCalculatorGUI.Components
{
internal class BeatmapCard : OsuClickableContainer
public partial class BeatmapCard : OsuClickableContainer
{
private readonly ProcessorWorkingBeatmap beatmap;

2
PerformanceCalculatorGUI/Components/ExtendedOsuCheckbox.cs
View file

@ -7,7 +7,7 @@ using osu.Game.Graphics.UserInterface;
namespace PerformanceCalculatorGUI.Components
{
internal class ExtendedOsuCheckbox : OsuCheckbox
public partial class ExtendedOsuCheckbox : OsuCheckbox
{
public ColourInfo TextColour { get; set; }

4
PerformanceCalculatorGUI/Components/ExtendedOsuSpriteText.cs
View file

@ -11,7 +11,7 @@ using osuTK;
namespace PerformanceCalculatorGUI.Components
{
internal class ExtendedOsuSpriteText : OsuSpriteText, IHasCustomTooltip<string>
public partial class ExtendedOsuSpriteText : OsuSpriteText, IHasCustomTooltip<string>
{
public override bool HandlePositionalInput => true;
@ -20,7 +20,7 @@ namespace PerformanceCalculatorGUI.Components
public ITooltip<string> GetCustomTooltip() => new MultilineTooltip();
}
public class MultilineTooltip : VisibilityContainer, ITooltip<string>
public partial class MultilineTooltip : VisibilityContainer, ITooltip<string>
{
private readonly FillFlowContainer textContainer;
private string currentData;

6
PerformanceCalculatorGUI/Components/ExtendedProfileScore.cs
View file

@ -48,7 +48,7 @@ namespace PerformanceCalculatorGUI.Components
}
}
public class ExtendedProfileItemContainer : ProfileItemContainer
public partial class ExtendedProfileItemContainer : ProfileItemContainer
{
public Action OnHoverAction { get; set; }
public Action OnUnhoverAction { get; set; }
@ -71,7 +71,7 @@ namespace PerformanceCalculatorGUI.Components
}
}
public class ExtendedProfileScore : CompositeDrawable
public partial class ExtendedProfileScore : CompositeDrawable
{
private const int height = 40;
private const int performance_width = 100;
@ -371,7 +371,7 @@ namespace PerformanceCalculatorGUI.Components
$"{statistics.GetValueOrDefault(HitResult.Great)} / {statistics.GetValueOrDefault(HitResult.Ok)} / {statistics.GetValueOrDefault(HitResult.Meh)} / {statistics.GetValueOrDefault(HitResult.Miss)}";
}
private class ScoreBeatmapMetadataContainer : OsuHoverContainer
private partial class ScoreBeatmapMetadataContainer : OsuHoverContainer
{
private readonly IBeatmapInfo beatmapInfo;

2
PerformanceCalculatorGUI/Components/ExtendedUserModSelectOverlay.cs
View file

@ -7,7 +7,7 @@ using osu.Game.Overlays.Mods;
namespace PerformanceCalculatorGUI.Components
{
internal class ExtendedUserModSelectOverlay : UserModSelectOverlay
public partial class ExtendedUserModSelectOverlay : UserModSelectOverlay
{
protected override bool ShowTotalMultiplier => false;

4
PerformanceCalculatorGUI/Components/LeaderboardTable.cs
View file

@ -23,7 +23,7 @@ namespace PerformanceCalculatorGUI.Components
public decimal Difference;
}
public class LeaderboardTable : RankingsTable<LeaderboardUser>
public partial class LeaderboardTable : RankingsTable<LeaderboardUser>
{
public LeaderboardTable(int page, IReadOnlyList<LeaderboardUser> rankings)
: base(page, rankings)
@ -89,7 +89,7 @@ namespace PerformanceCalculatorGUI.Components
return username;
}
private class DifferenceText : OsuSpriteText
private partial class DifferenceText : OsuSpriteText
{
private readonly decimal difference;

2
PerformanceCalculatorGUI/Components/Notification.cs
View file

@ -11,7 +11,7 @@ using osuTK.Graphics;
namespace PerformanceCalculatorGUI.Components
{
internal class Notification : Container
public partial class Notification : Container
{
public Notification(LocalisableString text)
{

2
PerformanceCalculatorGUI/Components/NotificationDisplay.cs
View file

@ -7,7 +7,7 @@ using osuTK;
namespace PerformanceCalculatorGUI.Components
{
internal class NotificationDisplay : Container
public partial class NotificationDisplay : Container
{
private readonly FillFlowContainer content;

2
PerformanceCalculatorGUI/Components/ScreenSelectionButton.cs
View file

@ -8,7 +8,7 @@ using osuTK;
namespace PerformanceCalculatorGUI.Components
{
internal class ScreenSelectionButton : ToolbarButton
public partial class ScreenSelectionButton : ToolbarButton
{
public ScreenSelectionButton(string title, IconUsage? icon = null, GlobalAction? hotkey = null)
{

2
PerformanceCalculatorGUI/Components/ScreenSelectionButtonIcon.cs
View file

@ -7,7 +7,7 @@ using osu.Game.Beatmaps.Drawables.Cards;
namespace PerformanceCalculatorGUI.Components;
public class ScreenSelectionButtonIcon : IconPill
public partial class ScreenSelectionButtonIcon : IconPill
{
public ScreenSelectionButtonIcon(IconUsage? icon = null)
: base(icon ?? FontAwesome.Solid.List)

2
PerformanceCalculatorGUI/Components/SettingsButton.cs
View file

@ -13,7 +13,7 @@ using osuTK;
namespace PerformanceCalculatorGUI.Components
{
internal class SettingsButton : ToolbarButton, IHasPopover
public partial class SettingsButton : ToolbarButton, IHasPopover
{
protected override Anchor TooltipAnchor => Anchor.TopRight;

5
PerformanceCalculatorGUI/Components/SettingsPopover.cs
View file

@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Online.Chat;
using osuTK;
@ -19,7 +18,7 @@ using PerformanceCalculatorGUI.Configuration;
namespace PerformanceCalculatorGUI.Components
{
internal class SettingsPopover : OsuPopover
public partial class SettingsPopover : OsuPopover
{
private SettingsManager configManager;
@ -112,7 +111,7 @@ namespace PerformanceCalculatorGUI.Components
Label = "UI Scale",
Current = { BindTarget = scaleBindable }
},
new OsuButton
new RoundedButton
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,

4
PerformanceCalculatorGUI/Components/StatefulButton.cs
View file

@ -5,7 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays;
namespace PerformanceCalculatorGUI.Components
@ -17,7 +17,7 @@ namespace PerformanceCalculatorGUI.Components
Done
}
internal class StatefulButton : OsuButton
public partial class StatefulButton : RoundedButton
{
[Resolved]
private OverlayColourProvider colourProvider { get; set; }

6
PerformanceCalculatorGUI/Components/StrainVisualizer.cs
View file

@ -23,7 +23,7 @@ using PerformanceCalculatorGUI.Components.TextBoxes;
namespace PerformanceCalculatorGUI.Components
{
public class StrainBar : Bar, IHasTooltip
public partial class StrainBar : Bar, IHasTooltip
{
public StrainBar(string tooltip)
{
@ -33,7 +33,7 @@ namespace PerformanceCalculatorGUI.Components
public LocalisableString TooltipText { get; }
}
public class StrainBarGraph : FillFlowContainer<StrainBar>
public partial class StrainBarGraph : FillFlowContainer<StrainBar>
{
/// <summary>
/// Manually sets the max value, if null <see cref="Enumerable.Max(IEnumerable{float})"/> is instead used
@ -71,7 +71,7 @@ namespace PerformanceCalculatorGUI.Components
}
}
internal class StrainVisualizer : Container
public partial class StrainVisualizer : Container
{
public readonly Bindable<Skill[]> Skills = new();

2
PerformanceCalculatorGUI/Components/TextBoxes/ExtendedLabelledTextBox.cs
View file

@ -5,7 +5,7 @@ using osu.Game.Graphics.UserInterfaceV2;
namespace PerformanceCalculatorGUI.Components.TextBoxes
{
internal class ExtendedLabelledTextBox : LabelledTextBox
public partial class ExtendedLabelledTextBox : LabelledTextBox
{
public new const float CORNER_RADIUS = 8;

6
PerformanceCalculatorGUI/Components/TextBoxes/FileChooserLabelledTextBox.cs
View file

@ -26,7 +26,7 @@ namespace PerformanceCalculatorGUI.Components.TextBoxes
/// <summary>
/// A labelled textbox which reveals an inline file chooser when clicked.
/// </summary>
internal class FileChooserLabelledTextBox : ExtendedLabelledTextBox, ICanAcceptFiles, IHasPopover
public partial class FileChooserLabelledTextBox : ExtendedLabelledTextBox, ICanAcceptFiles, IHasPopover
{
private readonly Bindable<string> initialPath;
private readonly string[] handledExtensions;
@ -85,7 +85,7 @@ namespace PerformanceCalculatorGUI.Components.TextBoxes
game.UnregisterImportHandler(this);
}
internal class FileChooserOsuTextBox : OsuTextBox
private partial class FileChooserOsuTextBox : OsuTextBox
{
public Action OnFocused;
@ -107,7 +107,7 @@ namespace PerformanceCalculatorGUI.Components.TextBoxes
public Popover GetPopover() => new FileChooserPopover(handledExtensions, currentFile, initialPath);
private class FileChooserPopover : OsuPopover
private partial class FileChooserPopover : OsuPopover
{
public FileChooserPopover(string[] handledExtensions, Bindable<FileInfo> currentFile, Bindable<string> initialPath = null)
{

2
PerformanceCalculatorGUI/Components/TextBoxes/LabelledPasswordTextBox.cs
View file

@ -5,7 +5,7 @@ using osu.Game.Graphics.UserInterface;
namespace PerformanceCalculatorGUI.Components.TextBoxes
{
internal class LabelledPasswordTextBox : ExtendedLabelledTextBox
public partial class LabelledPasswordTextBox : ExtendedLabelledTextBox
{
protected override OsuTextBox CreateTextBox() => new OsuPasswordTextBox();
}

4
PerformanceCalculatorGUI/Components/TextBoxes/LimitedLabelledFractionalNumberBox.cs
View file

@ -8,9 +8,9 @@ using osu.Game.Graphics.UserInterface;
namespace PerformanceCalculatorGUI.Components.TextBoxes
{
internal class LimitedLabelledFractionalNumberBox : ExtendedLabelledTextBox
public partial class LimitedLabelledFractionalNumberBox : ExtendedLabelledTextBox
{
internal class FractionalNumberBox : OsuTextBox
private partial class FractionalNumberBox : OsuTextBox
{
protected override bool AllowIme => false;

4
PerformanceCalculatorGUI/Components/TextBoxes/LimitedLabelledNumberBox.cs
View file

@ -7,9 +7,9 @@ using osu.Game.Graphics.UserInterfaceV2;
namespace PerformanceCalculatorGUI.Components.TextBoxes
{
internal class LimitedLabelledNumberBox : LabelledNumberBox
public partial class LimitedLabelledNumberBox : LabelledNumberBox
{
internal class LimitedNumberBox : OsuNumberBox
private partial class LimitedNumberBox : OsuNumberBox
{
protected override void OnUserTextAdded(string added)
{

2
PerformanceCalculatorGUI/Components/UserCard.cs
View file

@ -26,7 +26,7 @@ namespace PerformanceCalculatorGUI.Components
public decimal PlaycountPP { get; set; }
}
public class UserCard : UserListPanel
public partial class UserCard : UserListPanel
{
private OsuSpriteText liveLabel;
private OsuSpriteText localLabel;

2
PerformanceCalculatorGUI/Components/VerboseLoadingLayer.cs
View file

@ -14,7 +14,7 @@ namespace PerformanceCalculatorGUI.Components
/// <summary>
/// A <see cref="LoadingLayer"/> with additional text displayed below the spinner.
/// </summary>
internal class VerboseLoadingLayer : LoadingLayer
public partial class VerboseLoadingLayer : LoadingLayer
{
public Bindable<string> Text = new Bindable<string>();

8
PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj
View file

@ -6,10 +6,10 @@
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2022.1117.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2022.1117.0" />
<PackageReference Include="ppy.osu.Game" Version="2022.1123.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2022.1123.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2022.1117.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2022.1117.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2022.1117.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2022.1123.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2022.1123.0" />
</ItemGroup>
</Project>

2
PerformanceCalculatorGUI/PerformanceCalculatorGame.cs
View file

@ -18,7 +18,7 @@ using PerformanceCalculatorGUI.Configuration;
namespace PerformanceCalculatorGUI
{
public class PerformanceCalculatorGame : OsuGameBase
public partial class PerformanceCalculatorGame : OsuGameBase
{
private Bindable<WindowMode> windowMode;
private DependencyContainer dependencies;

2
PerformanceCalculatorGUI/PerformanceCalculatorSceneManager.cs
View file

@ -26,7 +26,7 @@ using PerformanceCalculatorGUI.Screens;
namespace PerformanceCalculatorGUI
{
public class PerformanceCalculatorSceneManager : CompositeDrawable
public partial class PerformanceCalculatorSceneManager : CompositeDrawable
{
private ScreenStack screenStack;

2
PerformanceCalculatorGUI/Screens/BeatmapLeaderboardScreen.cs
View file

@ -30,7 +30,7 @@ using PerformanceCalculatorGUI.Configuration;
namespace PerformanceCalculatorGUI.Screens
{
internal class BeatmapLeaderboardScreen : PerformanceCalculatorScreen
public partial class BeatmapLeaderboardScreen : PerformanceCalculatorScreen
{
private LimitedLabelledNumberBox beatmapIdTextBox;
private StatefulButton calculationButton;

2
PerformanceCalculatorGUI/Screens/LeaderboardScreen.cs
View file

@ -25,7 +25,7 @@ using PerformanceCalculatorGUI.Configuration;
namespace PerformanceCalculatorGUI.Screens
{
internal class LeaderboardScreen : PerformanceCalculatorScreen
public partial class LeaderboardScreen : PerformanceCalculatorScreen
{
[Cached]
private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);

2
PerformanceCalculatorGUI/Screens/ObjectInspection/CatchObjectInspectorRuleset.cs
View file

@ -17,7 +17,7 @@ using osu.Game.Rulesets.UI;
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
{
internal class CatchObjectInspectorRuleset : DrawableCatchRuleset
public partial class CatchObjectInspectorRuleset : DrawableCatchRuleset
{
private readonly CatchDifficultyHitObject[] difficultyHitObjects;

2
PerformanceCalculatorGUI/Screens/ObjectInspection/ObjectInspectionPanel.cs
View file

@ -11,7 +11,7 @@ using PerformanceCalculatorGUI.Components.TextBoxes;
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
{
internal class ObjectInspectionPanel : Container
public partial class ObjectInspectionPanel : Container
{
private OsuTextFlowContainer textFlow;

2
PerformanceCalculatorGUI/Screens/ObjectInspection/ObjectInspector.cs
View file

@ -27,7 +27,7 @@ using osuTK.Input;
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
{
internal class ObjectInspector : OsuFocusedOverlayContainer
public partial class ObjectInspector : OsuFocusedOverlayContainer
{
private DependencyContainer dependencies;

4
PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorDrawable.cs
View file

@ -13,7 +13,7 @@ using osu.Game.Rulesets.Osu.Objects;
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
{
internal class OsuObjectInspectorDrawable : PoolableDrawableWithLifetime<OsuObjectInspectorLifetimeEntry>
public partial class OsuObjectInspectorDrawable : PoolableDrawableWithLifetime<OsuObjectInspectorLifetimeEntry>
{
protected override void OnApply(OsuObjectInspectorLifetimeEntry entry)
{
@ -90,7 +90,7 @@ namespace PerformanceCalculatorGUI.Screens.ObjectInspection
}
}
internal class OsuObjectInspectorLifetimeEntry : LifetimeEntry
public class OsuObjectInspectorLifetimeEntry : LifetimeEntry
{
public event Action Invalidated;
public readonly OsuHitObject HitObject;

2
PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRenderer.cs
View file

@ -11,7 +11,7 @@ using osu.Game.Rulesets.Osu.Objects;
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
{
internal class OsuObjectInspectorRenderer : PooledDrawableWithLifetimeContainer<OsuObjectInspectorLifetimeEntry, OsuObjectInspectorDrawable>
public partial class OsuObjectInspectorRenderer : PooledDrawableWithLifetimeContainer<OsuObjectInspectorLifetimeEntry, OsuObjectInspectorDrawable>
{
private DrawablePool<OsuObjectInspectorDrawable> pool;

4
PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs
View file

@ -17,7 +17,7 @@ using osu.Game.Rulesets.UI;
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
{
public class OsuObjectInspectorRuleset : DrawableOsuRuleset
public partial class OsuObjectInspectorRuleset : DrawableOsuRuleset
{
public const int HIT_OBJECT_FADE_OUT_EXTENSION = 600;
@ -35,7 +35,7 @@ namespace PerformanceCalculatorGUI.Screens.ObjectInspection
protected override Playfield CreatePlayfield() => new OsuObjectInspectorPlayfield(difficultyHitObjects);
private class OsuObjectInspectorPlayfield : OsuPlayfield
private partial class OsuObjectInspectorPlayfield : OsuPlayfield
{
private readonly OsuObjectInspectorRenderer objectRenderer;
private readonly IReadOnlyList<OsuDifficultyHitObject> difficultyHitObjects;

2
PerformanceCalculatorGUI/Screens/ObjectInspection/TaikoObjectInspectorRuleset.cs
View file

@ -18,7 +18,7 @@ using osu.Game.Rulesets.UI;
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
{
public class TaikoObjectInspectorRuleset : DrawableTaikoRuleset
public partial class TaikoObjectInspectorRuleset : DrawableTaikoRuleset
{
private readonly TaikoDifficultyHitObject[] difficultyHitObjects;

2
PerformanceCalculatorGUI/Screens/ProfileScreen.cs
View file

@ -25,7 +25,7 @@ using PerformanceCalculatorGUI.Configuration;
namespace PerformanceCalculatorGUI.Screens
{
internal class ProfileScreen : PerformanceCalculatorScreen
public partial class ProfileScreen : PerformanceCalculatorScreen
{
[Cached]
private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);

7
PerformanceCalculatorGUI/Screens/SimulateScreen.cs
View file

@ -22,7 +22,6 @@ using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays;
using osu.Game.Rulesets;
@ -41,7 +40,7 @@ using PerformanceCalculatorGUI.Screens.ObjectInspection;
namespace PerformanceCalculatorGUI.Screens
{
public class SimulateScreen : PerformanceCalculatorScreen
public partial class SimulateScreen : PerformanceCalculatorScreen
{
private ProcessorWorkingBeatmap working;
@ -290,7 +289,7 @@ namespace PerformanceCalculatorGUI.Screens
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{
new OsuButton
new RoundedButton
{
Width = 100,
Margin = new MarginPadding { Top = 4.0f, Right = 5.0f },
@ -378,7 +377,7 @@ namespace PerformanceCalculatorGUI.Screens
AutoSizeAxes = Axes.Y,
Child = strainVisualizer = new StrainVisualizer()
},
new OsuButton
new RoundedButton
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,