CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:issue #219

Browse Source
This commit is contained in:
CJKmkp
2025-10-03 08:52:47 +08:00
parent 8d31c74b39
commit e3add94546
2 changed files with 64 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow.xaml
+40 -37
View File
@@ -1465,43 +1465,45 @@
<TextBlock Margin="0,0,0,8" Text="PPT翻页按钮" FontWeight="Bold" Foreground="#fafafa" <TextBlock Margin="0,0,0,8" Text="PPT翻页按钮" FontWeight="Bold" Foreground="#fafafa"
FontSize="20" /> FontSize="20" />
<Border ClipToBounds="True" Width="324" Height="182"> <Border ClipToBounds="True" Width="324" Height="182">
<Grid> <Viewbox Stretch="Uniform" StretchDirection="Both">
<Image Source="Resources/PresentationExample/page.jpg"></Image> <Grid Width="324" Height="182">
<Image Source="Resources/PresentationExample/toolbar.png" Height="16" <Image Source="Resources/PresentationExample/page.jpg" Width="324" Height="182" Stretch="Fill"></Image>
VerticalAlignment="Bottom" HorizontalAlignment="Center" /> <Image Source="Resources/PresentationExample/toolbar.png" Height="16" Width="324"
<Image Name="PPTBtnPreviewLS" Source="Resources/PresentationExample/sidebar-white.png" Width="10" VerticalAlignment="Bottom" HorizontalAlignment="Center" Stretch="Fill" />
VerticalAlignment="Center" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5" > <Image Name="PPTBtnPreviewLS" Source="Resources/PresentationExample/sidebar-white.png" Width="10" Height="40"
<Image.RenderTransform> VerticalAlignment="Center" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5" Stretch="Fill">
<TransformGroup> <Image.RenderTransform>
<TranslateTransform x:Name="PPTBtnPreviewLSTransform"/> <TransformGroup>
</TransformGroup> <TranslateTransform x:Name="PPTBtnPreviewLSTransform"/>
</Image.RenderTransform> </TransformGroup>
</Image> </Image.RenderTransform>
<Image Name="PPTBtnPreviewRS" Source="Resources/PresentationExample/sidebar-white.png" Width="10" </Image>
VerticalAlignment="Center" HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" > <Image Name="PPTBtnPreviewRS" Source="Resources/PresentationExample/sidebar-white.png" Width="10" Height="40"
<Image.RenderTransform> VerticalAlignment="Center" HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Stretch="Fill">
<TransformGroup> <Image.RenderTransform>
<TranslateTransform x:Name="PPTBtnPreviewRSTransform"/> <TransformGroup>
</TransformGroup> <TranslateTransform x:Name="PPTBtnPreviewRSTransform"/>
</Image.RenderTransform> </TransformGroup>
</Image> </Image.RenderTransform>
<Image Name="PPTBtnPreviewLB" Source="Resources/PresentationExample/bottombar-white.png" Height="10" </Image>
VerticalAlignment="Bottom" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5"> <Image Name="PPTBtnPreviewLB" Source="Resources/PresentationExample/bottombar-white.png" Height="10" Width="40"
<Image.RenderTransform> VerticalAlignment="Bottom" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5" Stretch="Fill">
<TransformGroup> <Image.RenderTransform>
<TranslateTransform x:Name="PPTBtnPreviewLBTransform"/> <TransformGroup>
</TransformGroup> <TranslateTransform x:Name="PPTBtnPreviewLBTransform"/>
</Image.RenderTransform> </TransformGroup>
</Image> </Image.RenderTransform>
<Image Name="PPTBtnPreviewRB" Source="Resources/PresentationExample/bottombar-white.png" Height="12" </Image>
VerticalAlignment="Bottom" HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5"> <Image Name="PPTBtnPreviewRB" Source="Resources/PresentationExample/bottombar-white.png" Height="12" Width="40"
<Image.RenderTransform> VerticalAlignment="Bottom" HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Stretch="Fill">
<TransformGroup> <Image.RenderTransform>
<TranslateTransform x:Name="PPTBtnPreviewRBTransform"/> <TransformGroup>
</TransformGroup> <TranslateTransform x:Name="PPTBtnPreviewRBTransform"/>
</Image.RenderTransform> </TransformGroup>
</Image> </Image.RenderTransform>
</Grid> </Image>
</Grid>
</Viewbox>
</Border> </Border>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"> <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Foreground="#fafafa" Text="在 PPT 模式下显示翻页按钮" <TextBlock Foreground="#fafafa" Text="在 PPT 模式下显示翻页按钮"
@@ -9773,3 +9775,4 @@
</Viewbox> </Viewbox>
</Grid> </Grid>
</Window> </Window>
Ink Canvas/MainWindow_cs/MW_Settings.cs
+21 -10
View File
@@ -1026,23 +1026,34 @@ namespace Ink_Canvas
PPTBtnPreviewRS.Visibility = Visibility.Collapsed; PPTBtnPreviewRS.Visibility = Visibility.Collapsed;
} }
// 计算预览区域的缩放比例 // 获取当前屏幕的实际尺寸（考虑DPI缩放）
double previewScaleY = 182.0 / SystemParameters.PrimaryScreenHeight; var actualScreenWidth = SystemParameters.PrimaryScreenWidth;
double previewScaleX = 324.0 / SystemParameters.PrimaryScreenWidth; var actualScreenHeight = SystemParameters.PrimaryScreenHeight;
double sideButtonScaleFactor = 1.9; // 预览区域固定尺寸
const double previewWidth = 324.0;
const double previewHeight = 182.0;
// 计算缩放比例（预览区域与实际屏幕的比例）
double scaleX = previewWidth / actualScreenWidth;
double scaleY = previewHeight / actualScreenHeight;
// 获取按钮位置设置
double rsPosition = Settings.PowerPointSettings.PPTRSButtonPosition; double rsPosition = Settings.PowerPointSettings.PPTRSButtonPosition;
double lsPosition = Settings.PowerPointSettings.PPTLSButtonPosition; double lsPosition = Settings.PowerPointSettings.PPTLSButtonPosition;
double lbPosition = Settings.PowerPointSettings.PPTLBButtonPosition;
double rbPosition = Settings.PowerPointSettings.PPTRBButtonPosition;
PPTBtnPreviewRSTransform.Y = -(rsPosition * 2 * previewScaleY / sideButtonScaleFactor); // 计算侧边按钮位置（Y轴偏移）
PPTBtnPreviewLSTransform.Y = -(lsPosition * 2 * previewScaleY / sideButtonScaleFactor); PPTBtnPreviewRSTransform.Y = -(rsPosition * scaleY);
PPTBtnPreviewLSTransform.Y = -(lsPosition * scaleY);
// 计算底部按钮位置（X轴偏移）
const double bottomMarginOffset = 6.0;
double scaledMarginOffset = bottomMarginOffset * scaleX;
double bottomButtonScaleFactor = 1.2; PPTBtnPreviewLBTransform.X = scaledMarginOffset + (lbPosition * scaleX);
double leftMarginOffset = 6 * previewScaleX; PPTBtnPreviewRBTransform.X = -(scaledMarginOffset + (rbPosition * scaleX));
PPTBtnPreviewLBTransform.X = leftMarginOffset + (Settings.PowerPointSettings.PPTLBButtonPosition * previewScaleX / bottomButtonScaleFactor);
PPTBtnPreviewRBTransform.X = -(leftMarginOffset + (Settings.PowerPointSettings.PPTRBButtonPosition * previewScaleX / bottomButtonScaleFactor));
} }
private void ToggleSwitchShowCursor_Toggled(object sender, RoutedEventArgs e) private void ToggleSwitchShowCursor_Toggled(object sender, RoutedEventArgs e)