RCS0056 - roslynator_max_line_length = 160

This commit is contained in:
RoosterDragon
2024-07-27 16:09:46 +01:00
committed by Matthias Mailänder
parent 9d5d2ab493
commit 0649f3dc32
129 changed files with 606 additions and 245 deletions

View File

@@ -78,7 +78,11 @@ namespace OpenRA.Mods.Common.Widgets
var checkmarkImage = getCheckmarkImageCache
.Update((GetCheckmark(), IsChecked()))
.Update((disabled, Depressed, hover, false, IsHighlighted()));
WidgetUtils.DrawSprite(checkmarkImage, new float2(rect.Right - (int)((rect.Height + checkmarkImage.Size.X) / 2), rect.Top + (int)((rect.Height - checkmarkImage.Size.Y) / 2)));
WidgetUtils.DrawSprite(
checkmarkImage,
new float2(
rect.Right - (int)((rect.Height + checkmarkImage.Size.X) / 2),
rect.Top + (int)((rect.Height - checkmarkImage.Size.Y) / 2)));
}
public override Widget Clone() { return new CheckboxWidget(this); }

View File

@@ -58,13 +58,20 @@ namespace OpenRA.Mods.Common.Widgets
getMarkerImage ??= WidgetUtils.GetCachedStatefulImage(Decorations, DecorationMarker);
var arrowImage = getMarkerImage.Update((isDisabled, Depressed, isHover, false, IsHighlighted()));
WidgetUtils.DrawSprite(arrowImage, stateOffset + new float2(rb.Right - (int)((rb.Height + arrowImage.Size.X) / 2), rb.Top + (int)((rb.Height - arrowImage.Size.Y) / 2)));
WidgetUtils.DrawSprite(
arrowImage,
stateOffset + new float2(
rb.Right - (int)((rb.Height + arrowImage.Size.X) / 2),
rb.Top + (int)((rb.Height - arrowImage.Size.Y) / 2)));
getSeparatorImage ??= WidgetUtils.GetCachedStatefulImage(Separators, SeparatorImage);
var separatorImage = getSeparatorImage.Update((isDisabled, Depressed, isHover, false, IsHighlighted()));
if (separatorImage != null)
WidgetUtils.DrawSprite(separatorImage, stateOffset + new float2(-3, 0) + new float2(rb.Right - rb.Height + 4, rb.Top + (int)((rb.Height - separatorImage.Size.Y) / 2)));
WidgetUtils.DrawSprite(
separatorImage,
stateOffset + new float2(-3, 0) + new float2(rb.Right - rb.Height + 4,
rb.Top + (int)((rb.Height - separatorImage.Size.Y) / 2)));
}
public override Widget Clone() { return new DropDownButtonWidget(this); }
@@ -138,7 +145,8 @@ namespace OpenRA.Mods.Common.Widgets
(panel as ScrollPanelWidget)?.ScrollToSelectedItem();
}
public void ShowDropDown<T>(string panelTemplate, int maxHeight, IEnumerable<T> options, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
public void ShowDropDown<T>(
string panelTemplate, int maxHeight, IEnumerable<T> options, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
{
var substitutions = new Dictionary<string, int>() { { "DROPDOWN_WIDTH", Bounds.Width } };
var panel = (ScrollPanelWidget)Ui.LoadWidget(panelTemplate, null, new WidgetArgs() { { "substitutions", substitutions } });
@@ -160,7 +168,8 @@ namespace OpenRA.Mods.Common.Widgets
AttachPanel(panel);
}
public void ShowDropDown<T>(string panelTemplate, int height, Dictionary<string, IEnumerable<T>> groups, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
public void ShowDropDown<T>(
string panelTemplate, int height, Dictionary<string, IEnumerable<T>> groups, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
{
var substitutions = new Dictionary<string, int>() { { "DROPDOWN_WIDTH", Bounds.Width } };
var panel = (ScrollPanelWidget)Ui.LoadWidget(panelTemplate, null, new WidgetArgs() { { "substitutions", substitutions } });

View File

@@ -471,11 +471,17 @@ namespace OpenRA.Mods.Common.Widgets.Logic
item.IsVisible = () =>
{
var allowed = (assetTypesToDisplay.HasFlag(AssetType.Sprite) && allowedSpriteExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)))
|| (assetTypesToDisplay.HasFlag(AssetType.Model) && allowedModelExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)))
|| (assetTypesToDisplay.HasFlag(AssetType.Audio) && allowedAudioExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)))
|| (assetTypesToDisplay.HasFlag(AssetType.Video) && allowedVideoExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)))
|| (assetTypesToDisplay.HasFlag(AssetType.Unknown) && !allowedExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)));
var allowed =
(assetTypesToDisplay.HasFlag(AssetType.Sprite)
&& allowedSpriteExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)))
|| (assetTypesToDisplay.HasFlag(AssetType.Model)
&& allowedModelExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)))
|| (assetTypesToDisplay.HasFlag(AssetType.Audio)
&& allowedAudioExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)))
|| (assetTypesToDisplay.HasFlag(AssetType.Video)
&& allowedVideoExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)))
|| (assetTypesToDisplay.HasFlag(AssetType.Unknown)
&& !allowedExtensions.Any(ext => filepath.EndsWith(ext, true, CultureInfo.InvariantCulture)));
if (assetVisByName.TryGetValue(filepath, out var visible))
return visible && allowed;

View File

@@ -87,7 +87,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
const string VoteKickVoteCancel = "dialog-vote-kick.vote-cancel";
[ObjectCreator.UseCtor]
public GameInfoStatsLogic(Widget widget, ModData modData, World world, OrderManager orderManager, WorldRenderer worldRenderer, Action<bool> hideMenu, Action closeMenu)
public GameInfoStatsLogic(Widget widget, ModData modData, World world,
OrderManager orderManager, WorldRenderer worldRenderer, Action<bool> hideMenu, Action closeMenu)
{
var player = world.LocalPlayer;
var playerPanel = widget.Get<ScrollPanelWidget>("PLAYER_LIST");

View File

@@ -135,7 +135,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var timeText = formatBuildTime.Update(buildTime * timeModifier / 100);
timeLabel.GetText = () => timeText;
timeLabel.TextColor = (pm != null && pm.PowerState != PowerState.Normal && tooltipIcon.ProductionQueue.Info.LowPowerModifier > 100) ? Color.Red : Color.White;
timeLabel.TextColor =
(pm != null && pm.PowerState != PowerState.Normal && tooltipIcon.ProductionQueue.Info.LowPowerModifier > 100)
? Color.Red
: Color.White;
var timeSize = font.Measure(timeText);
var costText = cost.ToString(NumberFormatInfo.CurrentInfo);

View File

@@ -19,7 +19,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public class SupportPowerTooltipLogic : ChromeLogic
{
[ObjectCreator.UseCtor]
public SupportPowerTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, Func<SupportPowersWidget.SupportPowerIcon> getTooltipIcon, World world)
public SupportPowerTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer,
Func<SupportPowersWidget.SupportPowerIcon> getTooltipIcon, World world)
{
widget.IsVisible = () => getTooltipIcon() != null && getTooltipIcon().Power.Info != null;
var nameLabel = widget.Get<LabelWidget>("NAME");

View File

@@ -40,7 +40,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var panel = widget.Get("CONTENT_PROMPT_PANEL");
var headerTemplate = panel.Get<LabelWidget>("HEADER_TEMPLATE");
var headerLines = !string.IsNullOrEmpty(content.InstallPromptMessage) ? content.InstallPromptMessage.Replace("\\n", "\n").Split('\n') : Array.Empty<string>();
var headerLines =
!string.IsNullOrEmpty(content.InstallPromptMessage)
? content.InstallPromptMessage.Replace("\\n", "\n").Split('\n')
: Array.Empty<string>();
var headerHeight = 0;
foreach (var l in headerLines)
{

View File

@@ -592,7 +592,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
panel = PanelType.Players;
var chatWasEnabled = chatEnabled;
chatEnabled = worldRenderer.World.IsReplay || (Game.RunTime >= TextNotificationsManager.ChatDisabledUntil && TextNotificationsManager.ChatDisabledUntil != uint.MaxValue);
chatEnabled =
worldRenderer.World.IsReplay ||
(Game.RunTime >= TextNotificationsManager.ChatDisabledUntil && TextNotificationsManager.ChatDisabledUntil != uint.MaxValue);
if (chatEnabled && !chatWasEnabled)
{

View File

@@ -284,7 +284,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
static void SetSpawnPoint(OrderManager orderManager, Session.Client playerToMove, int selectedSpawnPoint)
{
var owned = orderManager.LobbyInfo.Clients.Any(c => c.SpawnPoint == selectedSpawnPoint) || orderManager.LobbyInfo.DisabledSpawnPoints.Contains(selectedSpawnPoint);
var owned =
orderManager.LobbyInfo.Clients.Any(c => c.SpawnPoint == selectedSpawnPoint) ||
orderManager.LobbyInfo.DisabledSpawnPoints.Contains(selectedSpawnPoint);
if (selectedSpawnPoint == 0 || !owned)
orderManager.IssueOrder(Order.Command($"spawn {(playerToMove ?? orderManager.LocalClient).Index} {selectedSpawnPoint}"));
}

View File

@@ -205,17 +205,28 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var previewSmall = SetupMapPreview(widget.Get("MAP_SMALL"));
// Widgets to be made visible.
previewWidgets[PreviewStatus.Unknown] = new Widget[] { previewLarge };
previewWidgets[PreviewStatus.Playable] = new Widget[] { previewLarge, SetupAuthorAndMapType(widget.Get("MAP_AVAILABLE")) };
previewWidgets[PreviewStatus.Incompatible] = new Widget[] { previewLarge, widget.Get("MAP_INCOMPATIBLE") };
previewWidgets[PreviewStatus.Validating] = new Widget[] { previewSmall, widget.Get("MAP_VALIDATING") };
previewWidgets[PreviewStatus.UpdateAvailable] = new Widget[] { previewSmall, widget.Get("MAP_UPDATE_AVAILABLE"), updateButton };
previewWidgets[PreviewStatus.DownloadAvailable] = new Widget[] { previewSmall, SetUpInstallButton(SetupAuthorAndMapType(widget.Get("MAP_DOWNLOAD_AVAILABLE"))) };
previewWidgets[PreviewStatus.UpdateDownloadAvailable] = new Widget[] { previewSmall, SetUpInstallButton(widget.Get("MAP_UPDATE_DOWNLOAD_AVAILABLE")), updateButton };
previewWidgets[PreviewStatus.Searching] = new Widget[] { previewSmall, widget.Get("MAP_SEARCHING") };
previewWidgets[PreviewStatus.Downloading] = new Widget[] { previewSmall, SetUpDownloadProgress(widget.Get("MAP_DOWNLOADING")) };
previewWidgets[PreviewStatus.Unavailable] = new Widget[] { previewSmall, widget.Get("MAP_UNAVAILABLE"), retryButton };
previewWidgets[PreviewStatus.DownloadError] = new Widget[] { previewSmall, widget.Get("MAP_ERROR"), retryButton };
previewWidgets[PreviewStatus.Unknown] =
new Widget[] { previewLarge };
previewWidgets[PreviewStatus.Playable] =
new Widget[] { previewLarge, SetupAuthorAndMapType(widget.Get("MAP_AVAILABLE")) };
previewWidgets[PreviewStatus.Incompatible] =
new Widget[] { previewLarge, widget.Get("MAP_INCOMPATIBLE") };
previewWidgets[PreviewStatus.Validating] =
new Widget[] { previewSmall, widget.Get("MAP_VALIDATING") };
previewWidgets[PreviewStatus.UpdateAvailable] =
new Widget[] { previewSmall, widget.Get("MAP_UPDATE_AVAILABLE"), updateButton };
previewWidgets[PreviewStatus.DownloadAvailable] =
new Widget[] { previewSmall, SetUpInstallButton(SetupAuthorAndMapType(widget.Get("MAP_DOWNLOAD_AVAILABLE"))) };
previewWidgets[PreviewStatus.UpdateDownloadAvailable] =
new Widget[] { previewSmall, SetUpInstallButton(widget.Get("MAP_UPDATE_DOWNLOAD_AVAILABLE")), updateButton };
previewWidgets[PreviewStatus.Searching] =
new Widget[] { previewSmall, widget.Get("MAP_SEARCHING") };
previewWidgets[PreviewStatus.Downloading] =
new Widget[] { previewSmall, SetUpDownloadProgress(widget.Get("MAP_DOWNLOADING")) };
previewWidgets[PreviewStatus.Unavailable] =
new Widget[] { previewSmall, widget.Get("MAP_UNAVAILABLE"), retryButton };
previewWidgets[PreviewStatus.DownloadError] =
new Widget[] { previewSmall, widget.Get("MAP_ERROR"), retryButton };
// Hide all widgets.
foreach (var preview in previewWidgets)

View File

@@ -29,7 +29,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly CachedTransform<int, string> teamMessage;
[ObjectCreator.UseCtor]
public SpawnSelectorTooltipLogic(Widget widget, ModData modData, TooltipContainerWidget tooltipContainer, MapPreviewWidget preview, bool showUnoccupiedSpawnpoints)
public SpawnSelectorTooltipLogic(Widget widget, ModData modData,
TooltipContainerWidget tooltipContainer, MapPreviewWidget preview, bool showUnoccupiedSpawnpoints)
{
var showTooltip = true;
widget.IsVisible = () => preview.TooltipSpawnIndex != -1 && showTooltip;

View File

@@ -72,7 +72,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
static bool IncompatibleReplayDialog(string text, Dictionary<string, object> textArguments, ModData modData, Action onCancel)
{
ConfirmationDialogs.ButtonPrompt(modData, IncompatibleReplayTitle, text, textArguments: textArguments, onCancel: onCancel, cancelText: IncompatibleReplayAccept);
ConfirmationDialogs.ButtonPrompt(
modData, IncompatibleReplayTitle, text, textArguments: textArguments, onCancel: onCancel, cancelText: IncompatibleReplayAccept);
return false;
}
}

View File

@@ -70,7 +70,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var settings = Game.Settings;
map = modData.MapCache[modData.MapCache.ChooseInitialMap(modData.MapCache.PickLastModifiedMap(MapVisibility.Lobby) ?? Game.Settings.Server.Map, Game.CosmeticRandom)];
map = modData.MapCache[
modData.MapCache.ChooseInitialMap(
modData.MapCache.PickLastModifiedMap(MapVisibility.Lobby) ?? Game.Settings.Server.Map,
Game.CosmeticRandom)];
Ui.LoadWidget("MAP_PREVIEW", panel.Get("MAP_PREVIEW_ROOT"), new WidgetArgs
{

View File

@@ -32,7 +32,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
[ObjectCreator.UseCtor]
public AudioSettingsLogic(Action<string, string, Func<Widget, Func<bool>>, Func<Widget, Action>> registerPanel, string panelID, string label, WorldRenderer worldRenderer)
public AudioSettingsLogic(
Action<string, string, Func<Widget, Func<bool>>, Func<Widget, Action>> registerPanel,
string panelID,
string label,
WorldRenderer worldRenderer)
{
this.worldRenderer = worldRenderer;

View File

@@ -276,7 +276,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
duplicateHotkeyDefinition = modData.Hotkeys.GetFirstDuplicate(selectedHotkeyDefinition, hotkeyEntryWidget.Key);
isHotkeyValid = duplicateHotkeyDefinition == null || selectedHotkeyDefinition.Readonly;
isHotkeyDefault = hotkeyEntryWidget.Key == selectedHotkeyDefinition.Default || (!hotkeyEntryWidget.Key.IsValid() && !selectedHotkeyDefinition.Default.IsValid());
isHotkeyDefault =
hotkeyEntryWidget.Key == selectedHotkeyDefinition.Default ||
(!hotkeyEntryWidget.Key.IsValid() && !selectedHotkeyDefinition.Default.IsValid());
if (isHotkeyValid)
{

View File

@@ -212,7 +212,13 @@ namespace OpenRA.Mods.Common.Widgets
}
if (occupied)
WidgetUtils.FillEllipseWithColor(new Rectangle(pos.X - offset.X + 1, pos.Y - offset.Y + 1, (int)sprite.Size.X - 2, (int)sprite.Size.Y - 2), occupant.Color);
WidgetUtils.FillEllipseWithColor(
new Rectangle(
pos.X - offset.X + 1,
pos.Y - offset.Y + 1,
(int)sprite.Size.X - 2,
(int)sprite.Size.Y - 2),
occupant.Color);
WidgetUtils.DrawSprite(sprite, pos - offset);

View File

@@ -269,7 +269,9 @@ namespace OpenRA.Mods.Common.Widgets
lastIconIdx = i;
TooltipIcon = productionIcons[i];
currentTooltipToken = tooltipContainer.Value.SetTooltip(TooltipTemplate, new WidgetArgs { { "player", GetPlayer() }, { "getTooltipIcon", GetTooltipIcon } });
currentTooltipToken = tooltipContainer.Value.SetTooltip(
TooltipTemplate,
new WidgetArgs { { "player", GetPlayer() }, { "getTooltipIcon", GetTooltipIcon } });
return;
}

View File

@@ -336,7 +336,8 @@ namespace OpenRA.Mods.Common.Widgets
if (buildable != null)
{
if (CurrentQueue.Info.PayUpFront && currentQueue.GetProductionCost(buildable) > CurrentQueue.Actor.Owner.PlayerActor.Trait<PlayerResources>().GetCashAndResources())
if (CurrentQueue.Info.PayUpFront &&
currentQueue.GetProductionCost(buildable) > CurrentQueue.Actor.Owner.PlayerActor.Trait<PlayerResources>().GetCashAndResources())
return false;
Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Sounds", ClickSound, null);

View File

@@ -20,18 +20,21 @@ namespace OpenRA.Mods.Common.Widgets
{
public static class SelectionUtils
{
public static IEnumerable<Actor> SelectActorsOnScreen(World world, WorldRenderer wr, IEnumerable<string> selectionClasses, IEnumerable<Player> players)
public static IEnumerable<Actor> SelectActorsOnScreen(
World world, WorldRenderer wr, IEnumerable<string> selectionClasses, IEnumerable<Player> players)
{
var actors = world.ScreenMap.ActorsInMouseBox(wr.Viewport.TopLeft, wr.Viewport.BottomRight).Select(a => a.Actor);
return SelectActorsByOwnerAndSelectionClass(actors, players, selectionClasses);
}
public static IEnumerable<Actor> SelectActorsInWorld(World world, IEnumerable<string> selectionClasses, IEnumerable<Player> players)
public static IEnumerable<Actor> SelectActorsInWorld(
World world, IEnumerable<string> selectionClasses, IEnumerable<Player> players)
{
return SelectActorsByOwnerAndSelectionClass(world.Actors.Where(a => a.IsInWorld), players, selectionClasses);
}
public static IEnumerable<Actor> SelectActorsByOwnerAndSelectionClass(IEnumerable<Actor> actors, IEnumerable<Player> owners, IEnumerable<string> selectionClasses)
public static IEnumerable<Actor> SelectActorsByOwnerAndSelectionClass(
IEnumerable<Actor> actors, IEnumerable<Player> owners, IEnumerable<string> selectionClasses)
{
return actors.Where(a =>
{

View File

@@ -20,7 +20,8 @@ namespace OpenRA.Mods.Common.Widgets
{
public static class WidgetUtils
{
public static string GetStatefulImageName(string baseName, bool disabled = false, bool pressed = false, bool hover = false, bool focused = false)
public static string GetStatefulImageName(
string baseName, bool disabled = false, bool pressed = false, bool hover = false, bool focused = false)
{
var suffix = disabled ? "-disabled" :
focused ? "-focused" :
@@ -31,7 +32,8 @@ namespace OpenRA.Mods.Common.Widgets
return baseName + suffix;
}
public static CachedTransform<(bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted), Sprite> GetCachedStatefulImage(string collection, string imageName)
public static CachedTransform<(bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted), Sprite>
GetCachedStatefulImage(string collection, string imageName)
{
return new CachedTransform<(bool, bool, bool, bool, bool), Sprite>(
((bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted) args) =>
@@ -43,7 +45,8 @@ namespace OpenRA.Mods.Common.Widgets
}
// TODO: refactor buttons and related UI to use this function
public static CachedTransform<(bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted), Sprite[]> GetCachedStatefulPanelImages(string collection)
public static CachedTransform<(bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted), Sprite[]>
GetCachedStatefulPanelImages(string collection)
{
return new CachedTransform<(bool, bool, bool, bool, bool), Sprite[]>(
((bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted) args) =>