Skip to content

Commit 48480d9

Browse files
committed
Merge branch 'Aviuz-feature/sort_by_version'
2 parents 9ecb2d7 + 3e03d17 commit 48480d9

7 files changed

Lines changed: 452 additions & 5 deletions

File tree

Assemblies/ModSwitch.dll

7 KB
Binary file not shown.

Languages/English/Keyed/Keyed.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,5 @@ Do you want to keep your existing settings from the local copy or replace them w
9999
<ModSwitch.RestartRequired.Restart>Restart</ModSwitch.RestartRequired.Restart>
100100
<ModSwitch.RestartRequired.Defer>Later</ModSwitch.RestartRequired.Defer>
101101

102+
<ModSwitch.TreeView.Active>Active</ModSwitch.TreeView.Active>
102103
</LanguageData>

Source/ModSwitch/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
[assembly: System.Reflection.AssemblyCopyright("Copyright © DoctorVanGogh 2017")]
1313
[assembly: System.Runtime.InteropServices.ComVisible(false)]
1414
[assembly: System.Runtime.InteropServices.Guid("ab2e8e89-3d1d-4e36-a0ae-489b6ebc84a6")]
15-
[assembly: System.Reflection.AssemblyVersion("1.5.0.143")]
15+
[assembly: System.Reflection.AssemblyVersion("1.6.0.204")]
1616

1717

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.0.143
1+
1.6.0.204

Source/ModSwitch/[Patches]/Patches.cs

Lines changed: 439 additions & 3 deletions
Large diffs are not rendered by default.

Source/ModSwitch/[UI]/Assets.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public class Assets {
1818
public static readonly Texture2D DragHash;
1919
public static readonly Texture2D WarningSmall;
2020
public static readonly Texture2D Debug;
21+
public static readonly Texture2D Collapsed;
22+
public static readonly Texture2D Expanded;
2123

2224
static Assets() {
2325
Edit = ContentFinder<Texture2D>.Get("UI/Edit", true);
@@ -32,6 +34,8 @@ static Assets() {
3234
SteamCopy = ContentFinder<Texture2D>.Get("UI/ContentSources/SteamCopy", true);
3335
DragHash = ContentFinder<Texture2D>.Get("UI/Buttons/DragHash", true);
3436
WarningSmall = ContentFinder<Texture2D>.Get("UI/Warning-small", true);
37+
Collapsed = ContentFinder<Texture2D>.Get("UI/Buttons/Dev/Reveal", true);
38+
Expanded = ContentFinder<Texture2D>.Get("UI/Buttons/Dev/Collapse", true);
3539
}
3640
}
3741
}

Source/ModSwitch/[UI]/ModsConfigUI.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,12 @@ public static void DoSearchBlock(Rect area, string weatermark, GUIStyle style =
436436
if (shouldClearSearch)
437437
searchTerm = string.Empty;
438438
}
439+
440+
public static bool MatchCriteria(string value) {
441+
if (searchTerm != string.Empty)
442+
return value.IndexOf(searchTerm, StringComparison.CurrentCultureIgnoreCase) != -1;
443+
return true;
444+
}
439445
}
440446
}
441447
}

0 commit comments

Comments
 (0)