From 0684b00b3c4d000cf627b9c08a49d7469ae50d04 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Sun, 2 Jul 2023 00:25:07 +0200
Subject: [Ryujinx] Address dotnet-format issues (#5395)
* dotnet format style --severity info
Some changes were manually reverted.
* dotnet format analyzers --serverity info
Some changes have been minimally adapted.
* Restore a few unused methods and variables
* Address dotnet format CA1816 warnings
* Address or silence dotnet format CA2208 warnings
* Address or silence dotnet format CA1806 and a few CA1854 warnings
* Address dotnet format CA1822 warnings
* Make dotnet format succeed in style mode
* Address dotnet format CA2208 warnings properly
* Address most dotnet format whitespace warnings
* Apply dotnet format whitespace formatting
A few of them have been manually reverted and the corresponding warning was silenced
* Format if-blocks correctly
* Another rebase, another dotnet format run
* Run dotnet format whitespace after rebase
* Run dotnet format after rebase and remove unused usings
- analyzers
- style
- whitespace
* Add comments to disabled warnings
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"
This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.
* dotnet format whitespace after rebase
* First dotnet format pass
* Fix build issues
* Apply suggestions from code review
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Second dotnet format pass
* Update src/Ryujinx/Modules/Updater/Updater.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Add trailing commas and improve formatting
* Fix formatting and naming issues
* Rename nvStutterWorkaround to nvidiaStutterWorkaround
* Use using declarations and extend resource lifetimes
* Fix GTK issues
* Add formatting for generated files
* Add trailing commas
---------
Co-authored-by: Ac_K <Acoustik666@gmail.com>
---
src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs | 52 +++++++++++--------------------
1 file changed, 19 insertions(+), 33 deletions(-)
(limited to 'src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs')
diff --git a/src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs b/src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs
index b7577b85..241e5e6c 100644
--- a/src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs
+++ b/src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs
@@ -5,7 +5,6 @@ using Ryujinx.HLE.Ui;
using Ryujinx.Ui.Widgets;
using System;
using System.Threading;
-using Action = System.Action;
namespace Ryujinx.Ui.Applet
{
@@ -37,7 +36,7 @@ namespace Ryujinx.Ui.Applet
public bool DisplayMessageDialog(string title, string message)
{
- ManualResetEvent dialogCloseEvent = new ManualResetEvent(false);
+ ManualResetEvent dialogCloseEvent = new(false);
bool okPressed = false;
@@ -49,9 +48,9 @@ namespace Ryujinx.Ui.Applet
{
msgDialog = new MessageDialog(_parent, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Ok, null)
{
- Title = title,
- Text = message,
- UseMarkup = true
+ Title = title,
+ Text = message,
+ UseMarkup = true,
};
msgDialog.SetDefaultSize(400, 0);
@@ -84,10 +83,10 @@ namespace Ryujinx.Ui.Applet
public bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText)
{
- ManualResetEvent dialogCloseEvent = new ManualResetEvent(false);
+ ManualResetEvent dialogCloseEvent = new(false);
- bool okPressed = false;
- bool error = false;
+ bool okPressed = false;
+ bool error = false;
string inputText = args.InitialText ?? "";
Application.Invoke(delegate
@@ -96,14 +95,14 @@ namespace Ryujinx.Ui.Applet
{
var swkbdDialog = new SwkbdAppletDialog(_parent)
{
- Title = "Software Keyboard",
- Text = args.HeaderText,
- SecondaryText = args.SubtitleText
+ Title = "Software Keyboard",
+ Text = args.HeaderText,
+ SecondaryText = args.SubtitleText,
};
- swkbdDialog.InputEntry.Text = inputText;
+ swkbdDialog.InputEntry.Text = inputText;
swkbdDialog.InputEntry.PlaceholderText = args.GuideText;
- swkbdDialog.OkButton.Label = args.SubmitText;
+ swkbdDialog.OkButton.Label = args.SubmitText;
swkbdDialog.SetInputLengthValidation(args.StringLengthMin, args.StringLengthMax);
swkbdDialog.SetInputValidation(args.KeyboardMode);
@@ -143,7 +142,7 @@ namespace Ryujinx.Ui.Applet
public bool DisplayErrorAppletDialog(string title, string message, string[] buttons)
{
- ManualResetEvent dialogCloseEvent = new ManualResetEvent(false);
+ ManualResetEvent dialogCloseEvent = new(false);
bool showDetails = false;
@@ -151,12 +150,12 @@ namespace Ryujinx.Ui.Applet
{
try
{
- ErrorAppletDialog msgDialog = new ErrorAppletDialog(_parent, DialogFlags.DestroyWithParent, MessageType.Error, buttons)
+ ErrorAppletDialog msgDialog = new(_parent, DialogFlags.DestroyWithParent, MessageType.Error, buttons)
{
- Title = title,
- Text = message,
- UseMarkup = true,
- WindowPosition = WindowPosition.CenterAlways
+ Title = title,
+ Text = message,
+ UseMarkup = true,
+ WindowPosition = WindowPosition.CenterAlways,
};
msgDialog.SetDefaultSize(400, 0);
@@ -193,22 +192,9 @@ namespace Ryujinx.Ui.Applet
return showDetails;
}
- private void SynchronousGtkInvoke(Action action)
- {
- var waitHandle = new ManualResetEventSlim();
-
- Application.Invoke(delegate
- {
- action();
- waitHandle.Set();
- });
-
- waitHandle.Wait();
- }
-
public IDynamicTextInputHandler CreateDynamicTextInputHandler()
{
return new GtkDynamicTextInputHandler(_parent);
}
}
-}
\ No newline at end of file
+}
--
cgit v1.2.3-70-g09d2