Skip to content

Commit a992965

Browse files
WuChangingWuChanging
committed
[UI fix] BoardLaunchEasiCamera_Click, BoardLaunchDesmos_Click
1 parent ae700b4 commit a992965

File tree

3 files changed

+31
-33
lines changed

3 files changed

+31
-33
lines changed

‎Ink Canvas/MainWindow.xaml‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@
559559
Height="55"
560560
Padding="0"
561561
BorderThickness="0"
562-
Click="TwoFingerGestureBorder_MouseUp">
562+
Click="TwoFingerGestureBorder_Click">
563563
<Border
564564
Width="60"
565565
Height="55"
@@ -729,7 +729,7 @@
729729
Margin="0,0,5,0"
730730
Padding="0"
731731
BorderThickness="0"
732-
Click="BoardChangeBackgroundColorBtn_MouseUp">
732+
Click="BoardChangeBackgroundColorBtn_Click">
733733
<Border
734734
Width="60"
735735
Height="55"
@@ -1324,30 +1324,32 @@
13241324
</Grid>
13251325
</Border>
13261326
</Button>
1327-
<Border Width="0" MouseDown="Border_MouseDown" MouseUp="BoardSymbolIconDelete_MouseUp">
1327+
<Border Width="0">
13281328
<Border x:Name="BoardDeleteIcon"
1329-
Margin="-61,-55,-61,55"
1329+
Margin="-61,-50,-61,55"
13301330
Background="{DynamicResource BoardBarBackground}"
13311331
BorderBrush="{DynamicResource BoardBarBorderBrush}"
13321332
BorderThickness="1,1,1,0"
13331333
CornerRadius="5,5,0,0">
1334-
<Grid>
1335-
<ikw:SimpleStackPanel Margin="5" HorizontalAlignment="Center" Orientation="Horizontal">
1336-
<ui:FontIcon
1337-
Width="28"
1338-
Height="22"
1339-
FontFamily="{StaticResource FluentIconFontFamily}"
1340-
FontSize="22"
1341-
Foreground="{DynamicResource BoardBarForeground}"
1342-
Glyph="&#xe74d;" />
1343-
<TextBlock
1344-
Margin="5,0,0,0"
1345-
VerticalAlignment="Center"
1346-
FontSize="14"
1347-
Foreground="{DynamicResource BoardBarForeground}"
1348-
Text="点击清屏" />
1349-
</ikw:SimpleStackPanel>
1350-
</Grid>
1334+
<Button Padding="0" BorderThickness="0" Click="BoardSymbolIconDelete_Click">
1335+
<Grid>
1336+
<ikw:SimpleStackPanel Margin="5" HorizontalAlignment="Center" Orientation="Horizontal">
1337+
<ui:FontIcon
1338+
Width="28"
1339+
Height="22"
1340+
FontFamily="{StaticResource FluentIconFontFamily}"
1341+
FontSize="22"
1342+
Foreground="{DynamicResource BoardBarForeground}"
1343+
Glyph="&#xe74d;" />
1344+
<TextBlock
1345+
Margin="5,0,0,0"
1346+
VerticalAlignment="Center"
1347+
FontSize="14"
1348+
Foreground="{DynamicResource BoardBarForeground}"
1349+
Text="点击清屏" />
1350+
</ikw:SimpleStackPanel>
1351+
</Grid>
1352+
</Button>
13511353
</Border>
13521354
</Border>
13531355
<Button
@@ -1872,13 +1874,11 @@
18721874
BorderThickness="1.5"
18731875
CornerRadius="5">
18741876
<ikw:SimpleStackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
1875-
<Button BorderThickness="0" Click="ImageCountdownTimer_Click">
1877+
<Button BorderThickness="0" Click="BoardLaunchEasiCamera_Click">
18761878
<ikw:SimpleStackPanel
18771879
Height="35"
18781880
Margin="10,0"
18791881
HorizontalAlignment="Center"
1880-
MouseDown="Border_MouseDown"
1881-
MouseUp="BoardLaunchEasiCamera_MouseUp"
18821882
Orientation="Horizontal"
18831883
Spacing="5">
18841884
<Image Width="22" Height="22" RenderOptions.BitmapScalingMode="HighQuality" Source="/Resources/Icons-png/EasiCamera.png" />
@@ -1894,13 +1894,11 @@
18941894
X2="0"
18951895
Y1="0"
18961896
Y2="25" />
1897-
<Button BorderThickness="0" Click="ImageCountdownTimer_Click">
1897+
<Button BorderThickness="0" Click="BoardLaunchDesmos_Click">
18981898
<ikw:SimpleStackPanel
18991899
Height="35"
19001900
Margin="10,0"
19011901
HorizontalAlignment="Center"
1902-
MouseDown="Border_MouseDown"
1903-
MouseUp="BoardLaunchDesmos_MouseUp"
19041902
Orientation="Horizontal"
19051903
Spacing="5">
19061904
<Image Width="22" Height="22" RenderOptions.BitmapScalingMode="HighQuality" Source="/Resources/Icons-png/Desmos.png">
@@ -5462,7 +5460,7 @@
54625460
Height="34"
54635461
Padding="0"
54645462
BorderThickness="0"
5465-
Click="TwoFingerGestureBorder_MouseUp">
5463+
Click="TwoFingerGestureBorder_Click">
54665464
<ikw:SimpleStackPanel>
54675465
<ui:FontIcon x:Name="EnableTwoFingerGestureBtn"
54685466
Width="34"

‎Ink Canvas/MainWindow_cs/MW_BoardIcons.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Ink_Canvas
1111
{
1212
public partial class MainWindow : Window
1313
{
14-
private void BoardChangeBackgroundColorBtn_MouseUp(object sender, RoutedEventArgs e)
14+
private void BoardChangeBackgroundColorBtn_Click(object sender, RoutedEventArgs e)
1515
{
1616
if (!isLoaded) return;
1717
Settings.Canvas.UsingWhiteboard = !Settings.Canvas.UsingWhiteboard;
@@ -103,19 +103,19 @@ private void BoardEraserIconByStrokes_Click(object sender, RoutedEventArgs e)
103103
}
104104
}
105105

106-
private void BoardSymbolIconDelete_MouseUp(object sender, MouseButtonEventArgs e)
106+
private void BoardSymbolIconDelete_Click(object sender, RoutedEventArgs e)
107107
{
108108
PenIcon_Click(null, null);
109109
SymbolIconDelete_MouseUp(sender, e);
110110
}
111111

112-
private void BoardLaunchEasiCamera_MouseUp(object sender, MouseButtonEventArgs e)
112+
private void BoardLaunchEasiCamera_Click(object sender, RoutedEventArgs e)
113113
{
114114
ImageBlackboard_Click(null, null);
115115
SoftwareLauncher.LaunchEasiCamera("希沃视频展台");
116116
}
117117

118-
private void BoardLaunchDesmos_MouseUp(object sender, MouseButtonEventArgs e)
118+
private void BoardLaunchDesmos_Click(object sender, RoutedEventArgs e)
119119
{
120120
HideSubPanelsImmediately();
121121
ImageBlackboard_Click(null, null);

‎Ink Canvas/MainWindow_cs/MW_FloatBarIcons.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public partial class MainWindow : Window
2222
{
2323
#region TwoFingZoomBtn
2424

25-
private void TwoFingerGestureBorder_MouseUp(object sender, RoutedEventArgs e)
25+
private void TwoFingerGestureBorder_Click(object sender, RoutedEventArgs e)
2626
{
2727
if (TwoFingerGestureBorder.Visibility == Visibility.Visible)
2828
{

0 commit comments

Comments
 (0)