From 7d34aeaf9639d24232b7c8d7dac382ac15e85bfc Mon Sep 17 00:00:00 2001 From: Thom McGrath Date: Tue, 25 Jun 2024 12:33:31 -0400 Subject: [PATCH] Couple last minute fixes --- Project/Modules/Game Support/Ark.xojo_code | 4 +- .../Blueprints/ModFilterView.xojo_window | 46 ++++++++++--------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/Project/Modules/Game Support/Ark.xojo_code b/Project/Modules/Game Support/Ark.xojo_code index aa6d17fc1..0b981665c 100644 --- a/Project/Modules/Game Support/Ark.xojo_code +++ b/Project/Modules/Game Support/Ark.xojo_code @@ -615,13 +615,13 @@ Protected Module Ark #tag Method, Flags = &h0 Function Matches(Extends Blueprint As Ark.Blueprint, Rx As PCRE2CodeMBS) As Boolean - Return (Rx.Match(Blueprint.Path) Is Nil) = False Or (Rx.Match(Blueprint.ClassString) Is Nil) = False Or (Rx.Match(Blueprint.Label) Is Nil) = False + Return (Rx.Match(Blueprint.Path) Is Nil) = False Or (Rx.Match(Blueprint.ClassString) Is Nil) = False Or (Rx.Match(Blueprint.Label) Is Nil) = False Or (Rx.Match(Blueprint.BlueprintId) Is Nil) = False End Function #tag EndMethod #tag Method, Flags = &h0 Function Matches(Extends Blueprint As Ark.Blueprint, Filter As String) As Boolean - Return Blueprint.Path.IndexOf(Filter) > -1 Or Blueprint.Path.IndexOf(Filter) > -1 Or Blueprint.Label.IndexOf(Filter) > -1 + Return Blueprint.Path.IndexOf(Filter) > -1 Or Blueprint.Path.IndexOf(Filter) > -1 Or Blueprint.Label.IndexOf(Filter) > -1 Or Blueprint.BlueprintId.IndexOf(Filter) > -1 End Function #tag EndMethod diff --git a/Project/Views/Main Window Components/Blueprints/ModFilterView.xojo_window b/Project/Views/Main Window Components/Blueprints/ModFilterView.xojo_window index ee2e935c1..ecb54d95a 100644 --- a/Project/Views/Main Window Components/Blueprints/ModFilterView.xojo_window +++ b/Project/Views/Main Window Components/Blueprints/ModFilterView.xojo_window @@ -9,7 +9,7 @@ Begin DesktopContainer ModFilterView Composited = False Enabled = True HasBackgroundColor= False - Height = 268 + Height = 248 Index = -2147483648 InitialParent = "" Left = 0 @@ -36,7 +36,7 @@ Begin DesktopContainer ModFilterView Height = 140 Index = -2147483648 Italic = False - Left = 20 + Left = 10 LockBottom = False LockedInPosition= False LockLeft = True @@ -47,11 +47,11 @@ Begin DesktopContainer ModFilterView TabPanelIndex = 0 TabStop = True Tooltip = "" - Top = 20 + Top = 10 Transparent = False Underline = False Visible = True - Width = 260 + Width = 280 Begin DesktopCheckBox TypeLocalCheck AllowAutoDeactivate= True Bold = False @@ -64,7 +64,7 @@ Begin DesktopContainer ModFilterView Index = -2147483648 InitialParent = "TypesGroup" Italic = False - Left = 40 + Left = 30 LockBottom = False LockedInPosition= False LockLeft = True @@ -75,12 +75,13 @@ Begin DesktopContainer ModFilterView TabPanelIndex = 0 TabStop = True Tooltip = "#CheckboxTooltipLocal" - Top = 56 + Top = 46 Transparent = False Underline = False + Value = False Visible = True VisualState = 0 - Width = 220 + Width = 240 End Begin DesktopCheckBox TypeLocalReadOnlyCheck AllowAutoDeactivate= True @@ -94,7 +95,7 @@ Begin DesktopContainer ModFilterView Index = -2147483648 InitialParent = "TypesGroup" Italic = False - Left = 40 + Left = 30 LockBottom = False LockedInPosition= False LockLeft = True @@ -105,12 +106,13 @@ Begin DesktopContainer ModFilterView TabPanelIndex = 0 TabStop = True Tooltip = "#CheckboxTooltipLocal" - Top = 88 + Top = 78 Transparent = False Underline = False + Value = False Visible = True VisualState = 0 - Width = 220 + Width = 240 End Begin DesktopCheckBox TypeRemoteCheck AllowAutoDeactivate= True @@ -124,7 +126,7 @@ Begin DesktopContainer ModFilterView Index = -2147483648 InitialParent = "TypesGroup" Italic = False - Left = 40 + Left = 30 LockBottom = False LockedInPosition= False LockLeft = True @@ -135,12 +137,13 @@ Begin DesktopContainer ModFilterView TabPanelIndex = 0 TabStop = True Tooltip = "#CheckboxTooltipRemote" - Top = 120 + Top = 110 Transparent = False Underline = False + Value = False Visible = True VisualState = 0 - Width = 220 + Width = 240 End End Begin DesktopGroupBox GamesGroup @@ -154,7 +157,7 @@ Begin DesktopContainer ModFilterView Height = 76 Index = -2147483648 Italic = False - Left = 20 + Left = 10 LockBottom = False LockedInPosition= False LockLeft = True @@ -165,11 +168,11 @@ Begin DesktopContainer ModFilterView TabPanelIndex = 0 TabStop = True Tooltip = "" - Top = 172 + Top = 162 Transparent = False Underline = False Visible = True - Width = 260 + Width = 280 Begin DesktopCheckBox GameCheckboxes AllowAutoDeactivate= True Bold = False @@ -182,7 +185,7 @@ Begin DesktopContainer ModFilterView Index = 0 InitialParent = "GamesGroup" Italic = False - Left = 40 + Left = 30 LockBottom = False LockedInPosition= False LockLeft = True @@ -193,12 +196,13 @@ Begin DesktopContainer ModFilterView TabPanelIndex = 0 TabStop = True Tooltip = "" - Top = 208 + Top = 198 Transparent = False Underline = False + Value = False Visible = True VisualState = 0 - Width = 220 + Width = 240 End End End @@ -218,14 +222,14 @@ End Check.Top = NextTop Check.Height = 20 Check.Width = Self.Width - 80 - Check.Left = 40 + Check.Left = Self.GamesGroup.Left + 20 Check.Enabled = True Check.Value = Self.mSettings.Enabled(Games(Idx)) NextTop = Check.Bottom + 12 Next Self.GamesGroup.Height = (Games.Count * 20) + ((Games.Count - 1) * 12) + 56 - Self.Height = 52 + Self.TypesGroup.Height + Self.GamesGroup.Height + Self.Height = 32 + Self.TypesGroup.Height + Self.GamesGroup.Height Self.TypeLocalCheck.Value = Self.mSettings.Enabled(CType(ModsListView.ViewModes.Local, Integer)) Self.TypeLocalReadOnlyCheck.Value = Self.mSettings.Enabled(CType(ModsListView.ViewModes.LocalReadOnly, Integer))