TabbedPage some bugs fixed and implementation finished

Author: Ludwig Chilla (aka TenEniunlsl)

src/Controls/samples/Controls.Sample/Pages/Compatibility/TabbedPageGalleryMainPage.xaml.cs

@@ -3,7 +3,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
-using AndroidSpecific = Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
+#if GTK
+	using GTKSpecific = Microsoft.Maui.Controls.PlatformConfiguration.GTKSpecific;
+#else
+	using AndroidSpecific = Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
+#endif
 
 namespace Maui.Controls.Sample.Pages
 {
@@ -49,7 +53,11 @@ void OnSetToBottomTabs(object sender, EventArgs e)
 			};
 
 			SetNewMainPage(bottomTabs);
+#if GTK
+			GTKSpecific.TabbedPage.SetTabPosition(bottomTabs, GTKSpecific.TabPosition.Bottom);
+#else
 			AndroidSpecific.TabbedPage.SetToolbarPlacement(bottomTabs, AndroidSpecific.ToolbarPlacement.Bottom);
+#endif
 			Application.Current!.MainPage = bottomTabs;
 		}
 

src/Controls/src/Core/TabbedPage/TabbedPage.Gtk.cs

@@ -1,15 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Text;
+using System.Linq;
 using Gdk;
-using GLib;
 using Gtk;
-using Microsoft.Maui.Controls.Handlers.Items;
-using Microsoft.Maui.Controls.Handlers.Items.Platform;
 using Microsoft.Maui.Controls.Platform;
-using Microsoft.Maui.Handlers;
-using Microsoft.Maui.Platform;
+using Microsoft.Maui.Controls.PlatformConfiguration.GTKSpecific;
 
 namespace Microsoft.Maui.Controls
 {
@@ -20,14 +15,37 @@ public partial class TabbedPage
 		MauiTabbedPage CreatePlatformView(TabbedPage tabbedPage)
 		{
 			var mauiTabbedPage = new MauiTabbedPage();
+			
+			tabbedPage.PropertyChanged += (s, e) => 
+			{
+				if (e.PropertyName == PlatformConfiguration.GTKSpecific.TabbedPage.TabPositionProperty.PropertyName)
+				{
+					UpdateTabPosition(tabbedPage, mauiTabbedPage);
+				}
+			};
 
-			CreateChildPages(tabbedPage, mauiTabbedPage);
+			UpdateChildPages(tabbedPage, mauiTabbedPage);
 
 			mauiTabbedPage.SwitchPage += MauiTabbedPage_SwitchPage;
 
 			return mauiTabbedPage;
 		}
 
+		private void UpdateTabPosition(TabbedPage tabbedPage, MauiTabbedPage mauiTabbedPage)
+		{
+			var pos = PlatformConfiguration.GTKSpecific.TabbedPage.GetTabPosition(tabbedPage);
+
+			mauiTabbedPage.TabPos = pos switch
+			{
+				TabPosition.Top => Gtk.PositionType.Top,
+				TabPosition.Bottom => Gtk.PositionType.Bottom,
+				_ => Gtk.PositionType.Top
+			};
+
+			mauiTabbedPage.QueueResize();
+			mauiTabbedPage.QueueDraw();
+		}
+
 		private void MauiTabbedPage_SwitchPage(object sender, SwitchPageArgs args)
 		{
 			var newPage = this.Children[(int)args.PageNum];
@@ -44,31 +62,100 @@ private void MauiTabbedPage_SwitchPage(object sender, SwitchPageArgs args)
 			return null;
 		}
 
-		private void CreateChildPages(TabbedPage tabbedPage, MauiTabbedPage mauiTabbedPage)
+		private static void UpdateChildPages(TabbedPage tabbedPage, MauiTabbedPage mauiTabbedPage)
 		{
-			if (tabbedPage?.Handler?.MauiContext == null)
+			var mauiContext = tabbedPage.Handler?.MauiContext;
+			if (mauiContext == null)
 				return;
 
-			foreach (var page in tabbedPage.Children)
-			{
-				var platformChild = page.ToPlatform(tabbedPage.Handler.MauiContext);
+			var navigationItems = mauiTabbedPage.NavigationItems;
 
-				Gtk.Image? image = null;
+			var toRemove = new List<int>();
 
-				if (page.IconImageSource != null)
+			for (int i = 0; i < navigationItems.Count; i++)
+			{
+				var navItem = navigationItems[i];
+				var hasItem = tabbedPage.Children.Any(x => x.Id == navItem.Id);
+
+				if (!hasItem)
 				{
-					var task = page.IconImageSource.GetPlatformImageAsync(tabbedPage.Handler.MauiContext);
-					task.Wait();
+					toRemove.Add(i);
+				}
+			}
+
+			foreach (var idx in toRemove)
+			{
+				navigationItems.RemoveAt(idx);
+				mauiTabbedPage.RemovePage(idx);
+			}
 
-					var pixBuf = task.Result?.Value;
-					if (pixBuf != null)
+			for (int i = 0; i < tabbedPage.Children.Count; i++)
+			{
+				var page = tabbedPage.Children[i];
+				var existingNavItem = navigationItems.FirstOrDefault(x => x.Id == page.Id);
+
+				if (existingNavItem != default)
+				{
+					existingNavItem.Order = i;
+					existingNavItem.TabPageLabel.TextLabel.Text = page.Title;
+					if (page.IconImageSource != null)
 					{
-						image = new Gtk.Image(pixBuf.ScaleSimple(16, 16, InterpType.Bilinear));
+						var newIconSourceHash = page.IconImageSource.GetHashCode();
+						if (existingNavItem.TabPageLabel.IconSourceHash != page.IconImageSource.GetHashCode())
+						{
+							existingNavItem.TabPageLabel.Icon = GetImage(page.IconImageSource, mauiContext);
+							existingNavItem.TabPageLabel.IconSourceHash = newIconSourceHash;
+						}
+					}
+					else
+					{
+						existingNavItem.TabPageLabel.Icon = null;
+						existingNavItem.TabPageLabel.IconSourceHash = 0;
 					}
 				}
+				else
+				{
+					var platformChild = page.ToPlatform(mauiContext);
+
+					var image = GetImage(page.IconImageSource, mauiContext);
+					var iconSourceHash = page.IconImageSource?.GetHashCode() ?? 0;
 
-				mauiTabbedPage.AppendPage(platformChild, new MauiTabbedPage.MauiTabbedPageLabel(page.Title, image));
+					var navItem = new MauiTabbedPage.MauiTabbedPageNaviagtionItem(platformChild, new MauiTabbedPage.MauiTabPageLabel(page.Title, image, iconSourceHash), page.Id)
+					{
+						Order = i
+					};
+
+					navigationItems.Add(navItem);
+					navItem.TabPageLabel.Show();
+				}
 			}
+
+			mauiTabbedPage.UpdateTabPages();
+
+			mauiTabbedPage.BarBackgroundColor = tabbedPage.BarBackgroundColor;
+			mauiTabbedPage.SelectedItemTextColor = tabbedPage.SelectedTabColor;
+			mauiTabbedPage.UnselectedItemTextColor = tabbedPage.UnselectedTabColor;
+
+			int index = tabbedPage.Children.IndexOf(tabbedPage.CurrentPage);
+			mauiTabbedPage.CurrentPage = index;
+		}
+
+		private static Gtk.Image? GetImage(ImageSource imageSource, IMauiContext mauiContext)
+		{
+			Gtk.Image? image = null;
+
+			if (imageSource != null)
+			{
+				var task = imageSource.GetPlatformImageAsync(mauiContext);
+				task.Wait();
+
+				var pixBuf = task.Result?.Value;
+				if (pixBuf != null)
+				{
+					image = new Gtk.Image(pixBuf.ScaleSimple(16, 16, InterpType.Bilinear));
+				}
+			}
+			return image;
 		}
 
 		internal static void MapBarBackground(ITabbedViewHandler handler, TabbedPage view)
@@ -84,38 +171,59 @@ internal static void MapBarBackgroundColor(ITabbedViewHandler handler, TabbedPag
 
 		internal static void MapBarTextColor(ITabbedViewHandler handler, TabbedPage view)
 		{
-			view.PlatformView.SetLabelTextColor(view.BarTextColor);
+			view.PlatformView.BarTextColor = view.BarTextColor;
 		}
 
 		internal static void MapUnselectedTabColor(ITabbedViewHandler handler, TabbedPage view)
 		{
-			view.PlatformView.UnselectedColor = view.UnselectedTabColor;
+			view.PlatformView.UnselectedItemTextColor = view.UnselectedTabColor;
 		}
 
 		internal static void MapSelectedTabColor(ITabbedViewHandler handler, TabbedPage view)
 		{
-			view.PlatformView.SelectedColor = view.SelectedTabColor;
+			view.PlatformView.SelectedItemTextColor = view.SelectedTabColor;
 		}
-		
-		internal static void MapItemsSource(ITabbedViewHandler handler, TabbedPage view)
+
+		internal static void MapItemsSource(ITabbedViewHandler handler, TabbedPage tabbedPage)
 		{
-			//not needed
+			if (tabbedPage?.Handler?.MauiContext == null)
+				return;
+
+			var mauiTabbedPage = tabbedPage.PlatformView;
+
+			UpdateChildPages(tabbedPage, mauiTabbedPage);
+			
+			handler.UpdateValue(nameof(TabbedPage.CurrentPage));
 		}
 
-		internal static void MapItemTemplate(ITabbedViewHandler handler, TabbedPage view)
+		internal static void MapItemTemplate(ITabbedViewHandler handler, TabbedPage tabbedPage)
 		{
-			//not needed
+			if (tabbedPage?.Handler?.MauiContext == null)
+				return;
+
+			var mauiTabbedPage = tabbedPage.PlatformView;
+
+			UpdateChildPages(tabbedPage, mauiTabbedPage);
+
+			handler.UpdateValue(nameof(TabbedPage.CurrentPage));
 		}
 
-		internal static void MapSelectedItem(ITabbedViewHandler handler, TabbedPage view)
+		internal static void MapSelectedItem(ITabbedViewHandler handler, TabbedPage tabbedPage)
 		{
-			//not needed
+			if (tabbedPage?.Handler?.MauiContext == null)
+				return;
+
+			var mauiTabbedPage = tabbedPage.PlatformView;
+
+			UpdateChildPages(tabbedPage, mauiTabbedPage);
+
+			handler.UpdateValue(nameof(TabbedPage.CurrentPage));
 		}
 
-		internal static void MapCurrentPage(ITabbedViewHandler handler, TabbedPage view)
+		internal static void MapCurrentPage(ITabbedViewHandler handler, TabbedPage tabbedPage)
 		{
-			int index = view.Children.IndexOf(view.CurrentPage);
-			view.PlatformView.CurrentPage = index;
+			int index = tabbedPage.Children.IndexOf(tabbedPage.CurrentPage);
+			tabbedPage.PlatformView.CurrentPage = index;
 		}
 	}
 }

src/Core/src/Handlers/Window/WindowHandler.Gtk.cs

@@ -29,6 +29,10 @@ public static void MapContent(IWindowHandler handler, IWindow window)
 			}
 			else
 			{
+				if (handler.PlatformView.Child != null)
+				{
+					handler.PlatformView.Remove(handler.PlatformView.Child);
+				}
 				handler.PlatformView.Child = platformContent;
 			}
 		}