Merge pull request #77 from aschuhardt/beta

1.4.5 - Fix tabs loaded on startup not being able to show prompts
aschuhardt · Dec 4, 2023 · 7e78f15 · 7e78f15
2 parents b81b70f + b8a2863
commit 7e78f15
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/Controls/TabCollection.xaml.cs b/Controls/TabCollection.xaml.cs
@@ -163,6 +163,7 @@ protected override void OnApplyTemplate()
     public event EventHandler BookmarkChanged;
     public event EventHandler SelectedTabChanged;
     public event EventHandler ReorderingChanged;
+    public event EventHandler ParentPageNeeded;
 
     public void SelectTab(Tab tab)
     {
@@ -189,6 +190,12 @@ public void SelectTab(Tab tab)
 
     private void SetupTab(Tab tab)
     {
+        // if the parent page hasn't been assigned yet, then have MainPage set it for us;
+        // this is necessary for the tab views to display prompts, etc. but this method is
+        // called too early in startup for the value to have been properly set yet
+        if (ParentPage == null)
+            OnParentPageNeeded();
+
         tab.ParentPage = ParentPage;
         tab.OpeningUrlInNewTab += (_, arg) => AddTab(arg.Uri);
         tab.InitializedByTabCollection = true;
@@ -596,4 +603,9 @@ protected virtual void OnReorderingChanged()
     {
         ReorderingChanged?.Invoke(this, EventArgs.Empty);
     }
+
+    protected virtual void OnParentPageNeeded()
+    {
+        ParentPageNeeded?.Invoke(this, EventArgs.Empty);
+    }
 }
diff --git a/Resources/Raw/whats-new.html b/Resources/Raw/whats-new.html
@@ -9,7 +9,8 @@
             margin-top: 0!important;
         }
     </style>
-
+  <h4>Version 1.4.5 - December 3rd, 2023</h4>
+  <p>Fixed an issue that prevented tabs loaded on startup from showing prompts</p>
   <h4>Version 1.4.4 - November 27th, 2023</h4>
   <p>Fixed an issue that prevented non-Gemini links from opening correctly</p>
   <h4>Version 1.4.3 - November 27th, 2023</h4>

diff --git a/Views/MainPage.xaml b/Views/MainPage.xaml
@@ -161,6 +161,7 @@
             VerticalOptions="End"
             SelectedTabChanged="Tabs_SelectedTabChanged"
             ZIndex="10"
-            IsVisible="{Binding TabsEnabled}" />
+            IsVisible="{Binding TabsEnabled}"
+            ParentPageNeeded="TabCollection_OnParentTabNeeded"/>
     </AbsoluteLayout>
 </ContentPage>
diff --git a/Views/MainPage.xaml.cs b/Views/MainPage.xaml.cs
@@ -771,8 +771,6 @@ private async void MainPage_OnLoaded(object sender, EventArgs e)
         {
             AddMenuAnimations();
 
-            TabCollection.ParentPage = this;
-
             if (!TabCollection.Tabs.Any())
             {
                 if (!string.IsNullOrWhiteSpace(_settingsDatabase.LastVisitedUrl) && 
@@ -849,4 +847,9 @@ private void Tabs_SelectedTabChanged(object sender, EventArgs e)
         if (CurrentTab?.AfterSelected?.CanExecute(null) ?? false)
             CurrentTab.AfterSelected.Execute(null);
     }
+
+    private void TabCollection_OnParentTabNeeded(object sender, EventArgs e)
+    {
+        TabCollection.ParentPage = this;
+    }
 }