ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - d7b40cfbe0f3

Parent rev.

Child rev.

[Not reviewed]

R_T10_1.2 default

0 2 0

Tess Snider (Malkyne) - 3 years ago 2021-07-21 09:24:41
this@malkyne.org

Analyzing a Mixture should no longer cause the Pending Tests lists to
scroll down a little, for no reason.

2 files changed with 24 insertions and 13 deletions:

Models/ReactionTest.cs

ViewModels/ExperimentLogViewModel.cs

0 comments (0 inline, 0 general)

Models/ReactionTest.cs

➞

Show inline comments

@@ ... / @@ -219,8 +219,9 @@ namespace DesertPaintCodex.Models @@
+            }
             Reaction = null;
             BadReaction = null;
             Clipped = ClipType.None;
             State = TestState.Untested;
+        }
         public void SaveReaction()

ViewModels/ExperimentLogViewModel.cs

➞

Show inline comments

@@ ... / @@ -94,12 +94,17 @@ namespace DesertPaintCodex.ViewModels @@
+        }
         private void OnClearReaction()
+        {
             int oldPos = 0;
             ReactionTest test = TestView.ReactionTest;
             if (!CompletedTests.Contains(test)) return;
             if (RemainingTests.Contains(test))
+            {
                 SelectedRemainingTest = ResortTestInList(test, RemainingTests);
                 return;
+            }
-            int oldPos = CompletedTests.IndexOf(test);
             oldPos = CompletedTests.IndexOf(test);
             // Move test to Remaining Tests.
             InsertTestIntoList(test, RemainingTests);
             CompletedTests.RemoveAt(oldPos);
@@ ... / @@ -116,31 +121,36 @@ namespace DesertPaintCodex.ViewModels @@
+        }
         private void OnReactionResults()
+        {
             ReactionTest? test = null;
             int selectedTest = SelectedRemainingTest;
             if (selectedTest >= 0)
             int newPos = ResortTestInList(TestView.ReactionTest, RemainingTests);
             if (newPos != SelectedRemainingTest)
+            {
                 test = RemainingTests[selectedTest];
+            }
             ReactionTestService.PopulateRemainingTests(RemainingTests);
             if (test != null)
+            {
                 int newIndex = RemainingTests.IndexOf(test);
                 SelectedRemainingTest = newIndex;
                 SelectedRemainingTest = newPos;
+            }
+        }
         #endregion
         private static void InsertTestIntoList(ReactionTest test, IList<ReactionTest> list)
         private static int ResortTestInList(ReactionTest test, IList<ReactionTest> list)
+        {
             int oldPos = list.IndexOf(test);
             if (((oldPos > 0) || (test.CompareTo(list[oldPos - 1]) > 0))
                 && ((oldPos == list.Count - 1) || (test.CompareTo(list[oldPos + 1]) < 0))) return oldPos; // No need to move.
             list.RemoveAt(oldPos);
             return InsertTestIntoList(test, list);
+        }
         private static int InsertTestIntoList(ReactionTest test, IList<ReactionTest> list)
+        {
             int i;
             for (i = 0; i < list.Count; i++)
+            {
                 if (test.CompareTo(list[i]) < 0) break;
+            }
             list.Insert(i, test);
             return i;
+        }
+    }
+}

0 comments (0 inline, 0 general)