Fix for macos menu and hide panel button

Author: soliktomasz

BusLane.Tests/AppMenuTests.cs

@@ -5,6 +5,17 @@ namespace BusLane.Tests;
 
 public class AppMenuTests
 {
+    [Fact]
+    public void AppXaml_DefinesMacApplicationAboutMenu()
+    {
+        // Arrange
+        var xaml = File.ReadAllText(GetAppPath());
+
+        // Assert
+        xaml.Should().Contain("<NativeMenu.Menu>");
+        xaml.Should().Contain("<NativeMenuItem Header=\"About BusLane\" Click=\"AboutMenuItem_OnClick\"/>");
+    }
+
     [Fact]
     public void CreateMacMenu_Always_CreatesViewAndHelpMenusWithExpectedItems()
     {
@@ -46,4 +57,16 @@ public void CreateMacMenu_Always_CreatesViewAndHelpMenusWithExpectedItems()
         aboutItem.Header.Should().Be("About BusLane");
         aboutItem.HasClickHandlers.Should().BeTrue();
     }
+
+    private static string GetAppPath()
+    {
+        return Path.GetFullPath(Path.Combine(
+            AppContext.BaseDirectory,
+            "..",
+            "..",
+            "..",
+            "..",
+            "BusLane",
+            "App.axaml"));
+    }
 }

BusLane.Tests/Views/NavigationSidebarTests.cs

@@ -65,6 +65,18 @@ public void NavigationSidebar_RendersCollapsedRail()
         xaml.Should().Contain("Classes=\"sidebar-rail\"");
     }
 
+    [Fact]
+    public void NavigationSidebar_CollapsedRailExpandButton_UsesRestoreTreatmentAndOpenLeftPanelIcon()
+    {
+        // Arrange
+        var xaml = File.ReadAllText(GetSidebarPath());
+
+        // Assert
+        xaml.Should().Contain("Classes=\"entity-pane-restore-command\"");
+        xaml.Should().Contain("<LucideIcon Kind=\"PanelLeftOpen\" Size=\"18\"");
+        xaml.Should().NotContain("<LucideIcon Kind=\"PanelRightOpen\" Size=\"18\"");
+    }
+
     [Fact]
     public void NavigationSidebar_DoesNotRenderDisconnectAsStandalonePrimaryBlock()
     {

BusLane/App.axaml

@@ -5,6 +5,12 @@
              x:Class="BusLane.App"
              Name="BusLane"
              RequestedThemeVariant="Default">
+    <NativeMenu.Menu>
+        <NativeMenu>
+            <NativeMenuItem Header="About BusLane" Click="AboutMenuItem_OnClick"/>
+        </NativeMenu>
+    </NativeMenu.Menu>
+
     <Application.Resources>
         <ResourceDictionary>
 

BusLane/App.axaml.cs

@@ -99,9 +99,6 @@ private static void SetMacOSDockIcon()
             {
                 objc_msgSend(sharedApp, setApplicationIconImage, image);
             }
-
-            // Remove default "About Avalonia" item from the application menu.
-            RemoveDefaultMacOSAboutMenuItem(sharedApp);
         }
         catch
         {
@@ -179,41 +176,14 @@ private static async Task ShowAboutDialogAsync(Window owner)
         await dialog.ShowDialog(owner);
     }
 
-    private static void RemoveDefaultMacOSAboutMenuItem(IntPtr nsApp)
+    private async void AboutMenuItem_OnClick(object? sender, EventArgs args)
     {
-        try
-        {
-            // Get the main menu
-            var mainMenuSelector = sel_registerName("mainMenu");
-            var mainMenu = objc_msgSend(nsApp, mainMenuSelector);
+        if (MainWindow is null)
+            return;
 
-            if (mainMenu != IntPtr.Zero)
-            {
-                // Get the first item (application menu)
-                var itemAtIndexSelector = sel_registerName("itemAtIndex:");
-                var appMenuItem = objc_msgSend(mainMenu, itemAtIndexSelector, (IntPtr)0);
-
-                if (appMenuItem != IntPtr.Zero)
-                {
-                    // Get the submenu
-                    var submenuSelector = sel_registerName("submenu");
-                    var appMenu = objc_msgSend(appMenuItem, submenuSelector);
-
-                    if (appMenu != IntPtr.Zero)
-                    {
-                        // First entry is the default About item; remove it.
-                        var removeItemAtIndexSelector = sel_registerName("removeItemAtIndex:");
-                        objc_msgSend(appMenu, removeItemAtIndexSelector, (IntPtr)0);
-                    }
-                }
-            }
-        }
-        catch
-        {
-            // Silently fail if we can't modify the menu
-        }
+        await ShowAboutDialogAsync(MainWindow);
     }
-    
+
     [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_getClass")]
     private static extern IntPtr objc_getClass(string className);
 

BusLane/Views/Controls/NavigationSidebar.axaml

@@ -446,10 +446,10 @@
                         <Rectangle Canvas.Left="104" Canvas.Top="320" Width="304" Height="44" RadiusX="22" RadiusY="22" Fill="#FFFFFF"/>
                     </Canvas>
                 </Viewbox>
-                <Button Classes="panel-toggle"
+                <Button Classes="entity-pane-restore-command"
                         Command="{Binding ToggleNavigationPanelCommand}"
                         ToolTip.Tip="Expand navigation">
-                    <LucideIcon Kind="PanelRightOpen" Size="18"/>
+                    <LucideIcon Kind="PanelLeftOpen" Size="18"/>
                 </Button>
             </StackPanel>