白板

Author: PrefacedCorg

Ink Canvas/Controls/Toolbar/BoardToolbar/BoardToolbarRegistry.cs

@@ -1,5 +1,6 @@
 using Ink_Canvas.Controls;
 using Ink_Canvas.Helpers;
+using Ink_Canvas.Properties;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -70,7 +71,7 @@ public static FrameworkElement BuildView(string id, IBoardToolbarHost host)
             }
         }
 
-        public static List<FrameworkElement> BuildGroup(IBoardToolbarHost host, List<BoardToolbarComponentEntry> components)
+        public static List<FrameworkElement> BuildGroup(IBoardToolbarHost host, List<BoardToolbarComponentEntry> components, string areaId = null)
         {
             var views = new List<FrameworkElement>();
             var items = Discover();
@@ -82,7 +83,7 @@ public static List<FrameworkElement> BuildGroup(IBoardToolbarHost host, List<Boa
 
                 if (entry.Id == "board.pageInfo")
                 {
-                    var pageInfoView = BuildPageInfoView(host);
+                    var pageInfoView = BuildPageInfoView(host, areaId);
                     if (pageInfoView != null)
                     {
                         views.Add(pageInfoView);
@@ -105,6 +106,8 @@ public static List<FrameworkElement> BuildGroup(IBoardToolbarHost host, List<Boa
                         item.ApplyPosition(view, position);
                         ApplyComponentSettings(view, entry);
                         host.RegisterView(entry.Id, view);
+                        if (areaId != null)
+                            host.RegisterView($"{entry.Id}.{areaId}", view);
                         views.Add(view);
                     }
                 }
@@ -117,29 +120,44 @@ public static List<FrameworkElement> BuildGroup(IBoardToolbarHost host, List<Boa
             return views;
         }
 
-        private static FrameworkElement BuildPageInfoView(IBoardToolbarHost host)
+        private static FrameworkElement BuildPageInfoView(IBoardToolbarHost host, string areaId)
         {
             var pageInfoTextBlock = new TextBlock
             {
                 Text = "1/1",
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, -1, 0, 0),
+                FontSize = 17,
+                FontWeight = FontWeights.Bold,
+                TextAlignment = TextAlignment.Center
+            };
+            host.RegisterView($"board.pageInfo.{areaId}", pageInfoTextBlock);
+
+            var pageLabel = new TextBlock
+            {
+                Text = FloatingBarStrings.Board_Page,
                 Foreground = (Brush)Application.Current.TryFindResource("FloatBarForeground"),
-                VerticalAlignment = VerticalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Bottom,
                 HorizontalAlignment = HorizontalAlignment.Center,
-                FontSize = 14
+                FontSize = 12
             };
-            host.RegisterView("board.pageInfo", pageInfoTextBlock);
+
+            var grid = new Grid { Margin = new Thickness(6, 6, 6, 4) };
+            grid.Children.Add(pageInfoTextBlock);
+            grid.Children.Add(pageLabel);
 
             var pageInfoBorder = new Border
             {
-                CornerRadius = new CornerRadius(2),
-                Margin = new Thickness(2, 0, 2, 0),
-                Padding = new Thickness(6, 0, 6, 0),
-                Child = pageInfoTextBlock,
-                Cursor = System.Windows.Input.Cursors.Hand,
-                Background = Brushes.Transparent,
-                VerticalAlignment = VerticalAlignment.Stretch
+                Width = 75,
+                Height = 50,
+                BorderThickness = new Thickness(1),
+                BorderBrush = (Brush)Application.Current.TryFindResource("BoardFloatBarBorderBrush"),
+                Background = (Brush)Application.Current.TryFindResource("BoardFloatBarBackground"),
+                Opacity = 1,
+                Child = grid,
+                Cursor = System.Windows.Input.Cursors.Hand
             };
-            host.RegisterView("board.pageList.rightBtn", pageInfoBorder);
+            host.RegisterView($"board.pageList.{areaId}Btn", pageInfoBorder);
             return pageInfoBorder;
         }
 
@@ -202,7 +220,7 @@ public static Border CreateGroupBorder(List<FrameworkElement> views, Orientation
             {
                 CornerRadius = new CornerRadius(5, 5, 5, 5),
                 Background = (Brush)Application.Current.TryFindResource("BoardFloatBarBackground"),
-                Margin = new Thickness(0, 0, 5, 0),
+                Margin = new Thickness(0),
                 Child = panel
             };
 
@@ -375,7 +393,7 @@ private static void RebuildArea(IBoardToolbarHost host, Panel container, BoardTo
 
             foreach (var group in area.Groups)
             {
-                var views = BuildGroup(host, group.Components);
+                var views = BuildGroup(host, group.Components, area.Id);
                 if (views.Count > 0)
                 {
                     container.Children.Add(CreateGroupBorder(views));

Ink Canvas/Controls/Toolbar/BoardToolbar/WhiteboardPageManager.cs

@@ -633,7 +633,7 @@
                          Stretch="None">
                     <Grid Name="BlackboardLeftSide" Visibility="Collapsed" d:Visibility="Visible" Margin="0,0,0,3" Height="50"
                           HorizontalAlignment="Center" VerticalAlignment="Bottom">
-                        <ikw:SimpleStackPanel x:Name="BlackboardLeftSidePanel" Orientation="Horizontal" Spacing="5">
+                        <ikw:SimpleStackPanel x:Name="BlackboardLeftSidePanel" Orientation="Horizontal">
                             <!-- 白板左下角导航将由 BoardToolbarRegistry 动态构建 -->
                         </ikw:SimpleStackPanel>
                     </Grid>
@@ -689,7 +689,7 @@
                          Stretch="None">
                     <Grid Name="BlackboardRightSide" Visibility="Collapsed"  d:Visibility="Visible" Margin="0,0,0,3" Height="50"
                           HorizontalAlignment="Center" VerticalAlignment="Bottom">
-                        <ikw:SimpleStackPanel x:Name="BlackboardRightSidePanel" Orientation="Horizontal" Spacing="5">
+                        <ikw:SimpleStackPanel x:Name="BlackboardRightSidePanel" Orientation="Horizontal">
                             <!-- 白板右下角导航将由 BoardToolbarRegistry 动态构建 -->
                         </ikw:SimpleStackPanel>
                     </Grid>

Ink Canvas/MainWindow.xaml

@@ -714,26 +714,29 @@ private void UpdateIndexInfoDisplay()
             TextBlockWhiteBoardIndexInfo.Text =
                 $"{CurrentWhiteboardIndex}/{WhiteboardTotalCount}";
 
+            UpdatePageInfo();
+
             bool isLastPage = CurrentWhiteboardIndex == WhiteboardTotalCount;
             bool isMaxPage = WhiteboardTotalCount >= 99;
 
-            // 设置按钮文本
-            if (BtnLeftWhiteBoardSwitchNext != null) BtnLeftWhiteBoardSwitchNext.LabelTextBlockControl.Text = isLastPage ? "新页面" : FloatingBarStrings.Board_NextPage;
+            if (BtnLeftWhiteBoardSwitchNext != null) BtnLeftWhiteBoardSwitchNext.LabelTextBlockControl.Text = isLastPage ? FloatingBarStrings.Board_NewPage : FloatingBarStrings.Board_NextPage;
             if (BtnRightWhiteBoardSwitchNext != null) BtnRightWhiteBoardSwitchNext.LabelTextBlockControl.Text = isLastPage ? FloatingBarStrings.Board_NewPage : FloatingBarStrings.Board_NextPage;
 
             if (isLastPage)
             {
                 BtnWhiteBoardSwitchNext.IsEnabled = !isMaxPage;
+                if (BtnLeftWhiteBoardSwitchNext != null) BtnLeftWhiteBoardSwitchNext.IsEnabled = !isMaxPage;
+                if (BtnRightWhiteBoardSwitchNext != null) BtnRightWhiteBoardSwitchNext.IsEnabled = !isMaxPage;
             }
             else
             {
                 BtnWhiteBoardSwitchNext.IsEnabled = true;
+                if (BtnLeftWhiteBoardSwitchNext != null) BtnLeftWhiteBoardSwitchNext.IsEnabled = true;
+                if (BtnRightWhiteBoardSwitchNext != null) BtnRightWhiteBoardSwitchNext.IsEnabled = true;
             }
 
-            // 获取主题颜色资源
             var iconForegroundBrush = Application.Current.FindResource("IconForeground") as SolidColorBrush;
 
-            // 设置下一页按钮颜色
             if (iconForegroundBrush != null)
             {
                 if (BtnLeftWhiteBoardSwitchNext != null) BtnLeftWhiteBoardSwitchNext.IconGeometryDrawing.Brush = iconForegroundBrush;
@@ -743,10 +746,14 @@ private void UpdateIndexInfoDisplay()
             if (BtnRightWhiteBoardSwitchNext != null) BtnRightWhiteBoardSwitchNext.LabelTextBlockControl.Opacity = 1;
 
             BtnWhiteBoardSwitchPrevious.IsEnabled = true;
+            if (BtnLeftWhiteBoardSwitchPrevious != null) BtnLeftWhiteBoardSwitchPrevious.IsEnabled = true;
+            if (BtnRightWhiteBoardSwitchPrevious != null) BtnRightWhiteBoardSwitchPrevious.IsEnabled = true;
 
             if (CurrentWhiteboardIndex == 1)
             {
                 BtnWhiteBoardSwitchPrevious.IsEnabled = false;
+                if (BtnLeftWhiteBoardSwitchPrevious != null) BtnLeftWhiteBoardSwitchPrevious.IsEnabled = false;
+                if (BtnRightWhiteBoardSwitchPrevious != null) BtnRightWhiteBoardSwitchPrevious.IsEnabled = false;
                 if (iconForegroundBrush != null)
                 {
                     var disabledBrush = new SolidColorBrush(Color.FromArgb(127, iconForegroundBrush.Color.R, iconForegroundBrush.Color.G, iconForegroundBrush.Color.B));