[GTK] Fix navigation (#6692)

Commit 491947606d03647124bffffcea8547e135869027
introduced this change :

* [GTK] Don't recreate the toolbar on each change

However when changing page, toolbar needs to be recreated.

diff --git a/Xamarin.Forms.Platform.GTK/GtkToolbarTracker.cs b/Xamarin.Forms.Platform.GTK/GtkToolbarTracker.cs
index 829786e..af3938c 100644 (file)
--- a/Xamarin.Forms.Platform.GTK/GtkToolbarTracker.cs
+++ b/Xamarin.Forms.Platform.GTK/GtkToolbarTracker.cs
@@ -395,6 +395,11 @@ namespace Xamarin.Forms.Platform.GTK
                        }
                }
 
+               internal void ResetToolBar()
+               {
+                       _toolbar = null;
+               }
+
                private void OnToolbarItemPropertyChanged(object sender, PropertyChangedEventArgs e)
                {
                        if (e.PropertyName == MenuItem.IsEnabledProperty.PropertyName)

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.GTK/Renderers/NavigationPageRenderer.cs
index c30d8ea..67884ea 100644 (file)
--- a/Xamarin.Forms.Platform.GTK/Renderers/NavigationPageRenderer.cs
+++ b/Xamarin.Forms.Platform.GTK/Renderers/NavigationPageRenderer.cs
@@ -248,6 +248,10 @@ namespace Xamarin.Forms.Platform.GTK.Renderers
                        if (_currentPage != null)
                        {
                                _currentPage.PropertyChanged += OnCurrentPagePropertyChanged;
+                               if (_toolbarTracker != null)
+                               {
+                                       _toolbarTracker.ResetToolBar();
+                               }
                        }
 
                        UpdateTitle();