Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 04:53:29 +01:00
Code Issues Projects Releases Wiki Activity

cleaned up preprocessor instructions

Browse source
This commit is contained in:
Ell 2022-12-13 13:11:36 +01:00
parent e229432d0f
commit 14d0b24aa9
40 changed files with 119 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.editorconfig
View file

@ -87,8 +87,9 @@ resharper_indent_nested_for_stmt = true
resharper_indent_nested_lock_stmt = true resharper_indent_nested_lock_stmt = true
resharper_indent_nested_usings_stmt = true resharper_indent_nested_usings_stmt = true
resharper_indent_nested_while_stmt = true resharper_indent_nested_while_stmt = true
resharper_indent_preprocessor_if = usual_indent resharper_indent_preprocessor_if = no_indent
resharper_indent_preprocessor_other = usual_indent resharper_indent_preprocessor_other = no_indent
resharper_indent_preprocessor_region = no_indent
resharper_keep_existing_declaration_parens_arrangement = false resharper_keep_existing_declaration_parens_arrangement = false
resharper_keep_existing_embedded_arrangement = false resharper_keep_existing_embedded_arrangement = false
resharper_keep_existing_expr_member_arrangement = false resharper_keep_existing_expr_member_arrangement = false

1
MLEM.Ui/Parsers/UiParser.cs
View file

@ -10,6 +10,7 @@ using MLEM.Ui.Style;
#if NETSTANDARD2_0_OR_GREATER || NET6_0_OR_GREATER #if NETSTANDARD2_0_OR_GREATER || NET6_0_OR_GREATER
using System.Net.Http; using System.Net.Http;
#else #else
using System.Net; using System.Net;
#endif #endif

2
MLEM/Font/GenericFont.cs
View file

@ -360,7 +360,7 @@ namespace MLEM.Font {
var total = new StringBuilder(); var total = new StringBuilder();
var extraWidth = 0F; var extraWidth = 0F;
var endReached = false; var endReached = false;
foreach (var part in (fromBack ? text.Reverse() : text)) { foreach (var part in fromBack ? text.Reverse() : text) {
var curr = new StringBuilder(); var curr = new StringBuilder();
// if we reached the end previously, all the other parts should just be empty // if we reached the end previously, all the other parts should just be empty
if (!endReached) { if (!endReached) {

2
MLEM/Input/TextInput.cs
View file

@ -274,8 +274,8 @@ namespace MLEM.Input {
public void Update(GameTime time, InputHandler input) { public void Update(GameTime time, InputHandler input) {
this.UpdateTextDataIfDirty(); this.UpdateTextDataIfDirty();
// FNA's text input event doesn't supply keys, so we handle this here
#if FNA #if FNA
// FNA's text input event doesn't supply keys, so we handle this here
if (this.CaretPos > 0 && input.TryConsumePressed(Keys.Back)) { if (this.CaretPos > 0 && input.TryConsumePressed(Keys.Back)) {
this.CaretPos--; this.CaretPos--;
this.RemoveText(this.CaretPos, 1); this.RemoveText(this.CaretPos, 1);