diff --git a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml
index a48c4bc..8db2e0c 100644
--- a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml
+++ b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml
@@ -19,254 +19,303 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ IsManipulationEnabled="True" Background="{x:Null}"/>
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
index 1c6e05a..825e0f0 100644
--- a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
+++ b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
@@ -118,16 +118,16 @@ private void window_Closing(object sender, System.ComponentModel.CancelEventArgs
private void iconSwitchLeft_MouseDown(object sender, MouseButtonEventArgs e)
{
- Grid.SetColumn(MainGrid, 0);
- borderLeftToolBar.Visibility = Visibility.Collapsed;
- borderRightToolBar.Visibility = Visibility.Visible;
+ Grid.SetColumn(BorderMain, 0);
+ iconSwitchLeft.Visibility = Visibility.Collapsed;
+ iconSwitchRight.Visibility = Visibility.Visible;
}
private void iconSwitchRight_MouseDown(object sender, MouseButtonEventArgs e)
{
- Grid.SetColumn(MainGrid, 1);
- borderRightToolBar.Visibility = Visibility.Collapsed;
- borderLeftToolBar.Visibility = Visibility.Visible;
+ Grid.SetColumn(BorderMain, 1);
+ iconSwitchRight.Visibility = Visibility.Collapsed;
+ iconSwitchLeft.Visibility = Visibility.Visible;
}
#endregion
@@ -885,7 +885,6 @@ private void editCurriculumButton_Click(object sender, RoutedEventArgs e)
{
stackPanelCurriculum.Visibility = Visibility.Collapsed;
editCurriculumButton.Visibility = Visibility.Collapsed;
- StackPanelLauncher.Visibility = Visibility.Collapsed;
saveCurriculumButton.Visibility = Visibility.Visible;
scrollViewerCurriculum.Visibility = Visibility.Visible;
@@ -898,7 +897,6 @@ private void saveCurriculumButton_Click(object sender, RoutedEventArgs e)
stackPanelCurriculum.Visibility = Visibility.Visible;
editCurriculumButton.Visibility = Visibility.Visible;
- StackPanelLauncher.Visibility = Visibility.Visible;
saveCurriculumButton.Visibility = Visibility.Collapsed;
scrollViewerCurriculum.Visibility = Visibility.Collapsed;
@@ -1124,22 +1122,24 @@ private async void LoadLauncher()
Button LinkButton = new()
{
HorizontalAlignment = HorizontalAlignment.Stretch,
- Height = 48,
- HorizontalContentAlignment = HorizontalAlignment.Left
+ Height = 36,
+ HorizontalContentAlignment = HorizontalAlignment.Left,
+ Background = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0)),
+ BorderThickness = new Thickness(0)
};
//按钮里面的布局
SimpleStackPanel ContentStackPanel = new()
{
Spacing = 8,
- Margin = new(8, 8, 8, 8),
Orientation = Orientation.Horizontal
};
//图标
Image image = new()
{
- Height = 19
+ Height = 19,
+ VerticalAlignment = VerticalAlignment.Center
};
BitmapSource bitmapSource = System.Windows.Interop.Imaging.
CreateBitmapSourceFromHBitmap(file.Value.GetHbitmap(), IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
@@ -1154,7 +1154,8 @@ private async void LoadLauncher()
TextBlock textBlockLinkName = new()
{
- Text = Path.GetFileName(file.Key).Remove(Path.GetFileName(file.Key).LastIndexOf("."), 4)
+ Text = Path.GetFileName(file.Key).Remove(Path.GetFileName(file.Key).LastIndexOf("."), 4),
+ VerticalAlignment = VerticalAlignment.Center
};
//开始组装按钮
@@ -1581,8 +1582,7 @@ private void SetTheme(string theme)
if (inkCanvas.DefaultDrawingAttributes.Color == Colors.White)
{
- inkCanvas.DefaultDrawingAttributes.Color = Colors.Black;
- squarePicker_ColorChanged(null, null);
+ btnWhite_Click(null, null);
}
foreach (Stroke stroke in inkCanvas.Strokes)
@@ -1611,8 +1611,7 @@ private void SetTheme(string theme)
{
if (stroke.DrawingAttributes.Color == Colors.Black)
{
- stroke.DrawingAttributes.Color = Colors.White;
- squarePicker_ColorChanged(null, null);
+ btnWhite_Click(null, null);
}
}
}
diff --git a/ZongziTEK_Blackboard_Sticker/Style/Dark.xaml b/ZongziTEK_Blackboard_Sticker/Style/Dark.xaml
index 5b5aed9..16ae5b4 100644
--- a/ZongziTEK_Blackboard_Sticker/Style/Dark.xaml
+++ b/ZongziTEK_Blackboard_Sticker/Style/Dark.xaml
@@ -4,4 +4,5 @@
+
\ No newline at end of file
diff --git a/ZongziTEK_Blackboard_Sticker/Style/Light.xaml b/ZongziTEK_Blackboard_Sticker/Style/Light.xaml
index f6926ff..8e5feeb 100644
--- a/ZongziTEK_Blackboard_Sticker/Style/Light.xaml
+++ b/ZongziTEK_Blackboard_Sticker/Style/Light.xaml
@@ -4,4 +4,5 @@
+
\ No newline at end of file