add:PPT按钮透明度设置
This commit is contained in:
@@ -23,6 +23,10 @@ namespace Ink_Canvas.Helpers
|
||||
public int PPTRBButtonPosition { get; set; } = 0;
|
||||
public bool EnablePPTButtonPageClickable { get; set; } = true;
|
||||
public bool EnablePPTButtonLongPressPageTurn { get; set; } = true;
|
||||
public double PPTLSButtonOpacity { get; set; } = 0.5;
|
||||
public double PPTRSButtonOpacity { get; set; } = 0.5;
|
||||
public double PPTLBButtonOpacity { get; set; } = 0.5;
|
||||
public double PPTRBButtonOpacity { get; set; } = 0.5;
|
||||
#endregion
|
||||
|
||||
#region Private Fields
|
||||
@@ -381,10 +385,9 @@ namespace Ink_Canvas.Helpers
|
||||
_mainWindow.PPTLSPageButton.Visibility = pageButtonVisibility;
|
||||
_mainWindow.PPTRSPageButton.Visibility = pageButtonVisibility;
|
||||
|
||||
// 透明度设置
|
||||
var opacity = options[1] == '2' ? 0.5 : 1.0;
|
||||
_mainWindow.PPTBtnLSBorder.Opacity = opacity;
|
||||
_mainWindow.PPTBtnRSBorder.Opacity = opacity;
|
||||
// 透明度设置 - 直接使用用户设置的透明度值
|
||||
_mainWindow.PPTBtnLSBorder.Opacity = PPTLSButtonOpacity;
|
||||
_mainWindow.PPTBtnRSBorder.Opacity = PPTRSButtonOpacity;
|
||||
|
||||
// 颜色主题
|
||||
bool isDarkTheme = options[2] == '2';
|
||||
@@ -410,10 +413,9 @@ namespace Ink_Canvas.Helpers
|
||||
_mainWindow.PPTLBPageButton.Visibility = pageButtonVisibility;
|
||||
_mainWindow.PPTRBPageButton.Visibility = pageButtonVisibility;
|
||||
|
||||
// 透明度设置
|
||||
var opacity = options[1] == '2' ? 0.5 : 1.0;
|
||||
_mainWindow.PPTBtnLBBorder.Opacity = opacity;
|
||||
_mainWindow.PPTBtnRBBorder.Opacity = opacity;
|
||||
// 透明度设置 - 直接使用用户设置的透明度值
|
||||
_mainWindow.PPTBtnLBBorder.Opacity = PPTLBButtonOpacity;
|
||||
_mainWindow.PPTBtnRBBorder.Opacity = PPTRBButtonOpacity;
|
||||
|
||||
// 颜色主题
|
||||
bool isDarkTheme = options[2] == '2';
|
||||
|
||||
@@ -1643,6 +1643,82 @@
|
||||
VerticalAlignment="Center" FontSize="13"
|
||||
Margin="8,0,8,0" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
|
||||
Name="PPTLSButtonOpacityPanel"
|
||||
Visibility="{Binding ElementName=CheckboxSPPTHalfOpacity, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
|
||||
<TextBlock Foreground="#fafafa" Text="左侧透明度" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,12,0" />
|
||||
<Slider x:Name="PPTLSButtonOpacityValueSlider" Minimum="0.1"
|
||||
Maximum="1.0" Width="138" FontFamily="Microsoft YaHei UI"
|
||||
FontSize="20" IsSnapToTickEnabled="True" Value="0.5"
|
||||
TickFrequency="0.1"
|
||||
TickPlacement="None" AutoToolTipPlacement="None"
|
||||
ValueChanged="PPTLSButtonOpacityValueSlider_ValueChanged" />
|
||||
<Button Padding="5" Margin="8,0,0,0" Name="PPTLSOpacityPlusBtn"
|
||||
Click="PPTLSOpacityPlusBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V16 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,16z M0,0z M9,1C9,0.447715 8.55229,0 8,0 7.44772,0 7,0.447715 7,1L7,7 1,7C0.447715,7 0,7.44772 0,8 0,8.55229 0.447715,9 1,9L7,9 7,15C7,15.5523 7.44772,16 8,16 8.55229,16 9,15.5523 9,15L9,9 15,9C15.5523,9 16,8.55229 16,8 16,7.44772 15.5523,7 15,7L9,7 9,1z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTLSOpacityMinusBtn"
|
||||
Click="PPTLSOpacityMinusBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V2 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,2z M0,0z M0,1C0,0.447715,0.447715,0,1,0L15,0C15.5523,0 16,0.447715 16,1 16,1.55228 15.5523,2 15,2L1,2C0.447715,2,0,1.55228,0,1z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTLSOpacitySyncBtn"
|
||||
Click="PPTLSOpacitySyncBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V6 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,6z M0,0z M1,0C0.447715,0 0,0.447715 0,1 0,1.55228 0.447715,2 1,2L15,2C15.5523,2 16,1.55228 16,1 16,0.447715 15.5523,0 15,0L1,0z M1,4C0.447715,4 0,4.44772 0,5 0,5.55228 0.447715,6 1,6L15,6C15.5523,6 16,5.55228 16,5 16,4.44772 15.5523,4 15,4L1,4z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTLSOpacityResetBtn"
|
||||
Click="PPTLSOpacityResetBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M24,24z M0,0z M12,2.01123C10.5428,2.01123 9.14528,2.5901 8.11488,3.6205 7.08449,4.65089 6.50562,6.04841 6.50562,7.50561L6.50562,16.4944C6.50562,17.9516 7.08449,19.3491 8.11488,20.3795 9.14528,21.4099 10.5428,21.9888 12,21.9888 13.4572,21.9888 14.8547,21.4099 15.8851,20.3795 16.9135,19.3511 17.4922,17.9569 17.4944,16.5027 17.4944,16.4999 17.4944,16.4972 17.4944,16.4944L17.4944,7.50563C17.4944,7.50285 17.4944,7.50007 17.4944,7.4973 17.4922,6.0431 16.9135,4.64893 15.8851,3.6205 14.8547,2.5901 13.4572,2.01123 12,2.01123z M9.5291,5.03471C10.1844,4.37939 11.0732,4.01123 12,4.01123 12.9268,4.01123 13.8156,4.37939 14.4709,5.03471 15.1262,5.69003 15.4944,6.57884 15.4944,7.50561L15.4944,16.4944C15.4944,17.4211 15.1262,18.31 14.4709,18.9653 13.8156,19.6206 12.9268,19.9888 12,19.9888 11.0732,19.9888 10.1844,19.6206 9.5291,18.9653 8.87377,18.31 8.50562,17.4211 8.50562,16.4944L8.50562,7.50561C8.50562,6.57884,8.87377,5.69003,9.5291,5.03471z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<TextBlock
|
||||
Text="{Binding ElementName=PPTLSButtonOpacityValueSlider, Path=Value, StringFormat='{}{0:F1}'}"
|
||||
VerticalAlignment="Center" FontSize="13"
|
||||
Margin="8,0,0,0" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="右侧偏移" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,12,0" />
|
||||
@@ -1717,6 +1793,82 @@
|
||||
VerticalAlignment="Center" FontSize="13"
|
||||
Margin="8,0,16,0" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
|
||||
Name="PPTRSButtonOpacityPanel"
|
||||
Visibility="{Binding ElementName=CheckboxSPPTHalfOpacity, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
|
||||
<TextBlock Foreground="#fafafa" Text="右侧透明度" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,12,0" />
|
||||
<Slider x:Name="PPTRSButtonOpacityValueSlider" Minimum="0.1"
|
||||
Maximum="1.0" Width="138" FontFamily="Microsoft YaHei UI"
|
||||
FontSize="20" IsSnapToTickEnabled="True" Value="0.5"
|
||||
TickFrequency="0.1"
|
||||
TickPlacement="None" AutoToolTipPlacement="None"
|
||||
ValueChanged="PPTRSButtonOpacityValueSlider_ValueChanged" />
|
||||
<Button Padding="5" Margin="8,0,0,0" Name="PPTRSOpacityPlusBtn"
|
||||
Click="PPTRSOpacityPlusBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V16 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,16z M0,0z M9,1C9,0.447715 8.55229,0 8,0 7.44772,0 7,0.447715 7,1L7,7 1,7C0.447715,7 0,7.44772 0,8 0,8.55229 0.447715,9 1,9L7,9 7,15C7,15.5523 7.44772,16 8,16 8.55229,16 9,15.5523 9,15L9,9 15,9C15.5523,9 16,8.55229 16,8 16,7.44772 15.5523,7 15,7L9,7 9,1z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTRSOpacityMinusBtn"
|
||||
Click="PPTRSOpacityMinusBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V2 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,2z M0,0z M0,1C0,0.447715,0.447715,0,1,0L15,0C15.5523,0 16,0.447715 16,1 16,1.55228 15.5523,2 15,2L1,2C0.447715,2,0,1.55228,0,1z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTRSOpacitySyncBtn"
|
||||
Click="PPTRSOpacitySyncBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V6 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,6z M0,0z M1,0C0.447715,0 0,0.447715 0,1 0,1.55228 0.447715,2 1,2L15,2C15.5523,2 16,1.55228 16,1 16,0.447715 15.5523,0 15,0L1,0z M1,4C0.447715,4 0,4.44772 0,5 0,5.55228 0.447715,6 1,6L15,6C15.5523,6 16,5.55228 16,5 16,4.44772 15.5523,4 15,4L1,4z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTRSOpacityResetBtn"
|
||||
Click="PPTRSOpacityResetBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M24,24z M0,0z M12,2.01123C10.5428,2.01123 9.14528,2.5901 8.11488,3.6205 7.08449,4.65089 6.50562,6.04841 6.50562,7.50561L6.50562,16.4944C6.50562,17.9516 7.08449,19.3491 8.11488,20.3795 9.14528,21.4099 10.5428,21.9888 12,21.9888 13.4572,21.9888 14.8547,21.4099 15.8851,20.3795 16.9135,19.3511 17.4922,17.9569 17.4944,16.5027 17.4944,16.4999 17.4944,16.4972 17.4944,16.4944L17.4944,7.50563C17.4944,7.50285 17.4944,7.50007 17.4944,7.4973 17.4922,6.0431 16.9135,4.64893 15.8851,3.6205 14.8547,2.5901 13.4572,2.01123 12,2.01123z M9.5291,5.03471C10.1844,4.37939 11.0732,4.01123 12,4.01123 12.9268,4.01123 13.8156,4.37939 14.4709,5.03471 15.1262,5.69003 15.4944,6.57884 15.4944,7.50561L15.4944,16.4944C15.4944,17.4211 15.1262,18.31 14.4709,18.9653 13.8156,19.6206 12.9268,19.9888 12,19.9888 11.0732,19.9888 10.1844,19.6206 9.5291,18.9653 8.87377,18.31 8.50562,17.4211 8.50562,16.4944L8.50562,7.50561C8.50562,6.57884,8.87377,5.69003,9.5291,5.03471z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<TextBlock
|
||||
Text="{Binding ElementName=PPTRSButtonOpacityValueSlider, Path=Value, StringFormat='{}{0:F1}'}"
|
||||
VerticalAlignment="Center" FontSize="13"
|
||||
Margin="8,0,0,0" />
|
||||
</ui:SimpleStackPanel>
|
||||
<TextBlock
|
||||
Text="# 调大往上偏移，调小往下偏移，修改为0为不偏移，居中放置"
|
||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||
@@ -1796,6 +1948,82 @@
|
||||
VerticalAlignment="Center" FontSize="13"
|
||||
Margin="8,0,8,0" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
|
||||
Name="PPTLBButtonOpacityPanel"
|
||||
Visibility="{Binding ElementName=CheckboxBPPTHalfOpacity, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
|
||||
<TextBlock Foreground="#fafafa" Text="左下透明度" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,12,0" />
|
||||
<Slider x:Name="PPTLBButtonOpacityValueSlider" Minimum="0.1"
|
||||
Maximum="1.0" Width="138" FontFamily="Microsoft YaHei UI"
|
||||
FontSize="20" IsSnapToTickEnabled="True" Value="0.5"
|
||||
TickFrequency="0.1"
|
||||
TickPlacement="None" AutoToolTipPlacement="None"
|
||||
ValueChanged="PPTLBButtonOpacityValueSlider_ValueChanged" />
|
||||
<Button Padding="5" Margin="8,0,0,0" Name="PPTLBOpacityPlusBtn"
|
||||
Click="PPTLBOpacityPlusBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V16 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,16z M0,0z M9,1C9,0.447715 8.55229,0 8,0 7.44772,0 7,0.447715 7,1L7,7 1,7C0.447715,7 0,7.44772 0,8 0,8.55229 0.447715,9 1,9L7,9 7,15C7,15.5523 7.44772,16 8,16 8.55229,16 9,15.5523 9,15L9,9 15,9C15.5523,9 16,8.55229 16,8 16,7.44772 15.5523,7 15,7L9,7 9,1z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTLBOpacityMinusBtn"
|
||||
Click="PPTLBOpacityMinusBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V2 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,2z M0,0z M0,1C0,0.447715,0.447715,0,1,0L15,0C15.5523,0 16,0.447715 16,1 16,1.55228 15.5523,2 15,2L1,2C0.447715,2,0,1.55228,0,1z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTLBOpacitySyncBtn"
|
||||
Click="PPTLBOpacitySyncBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V6 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,6z M0,0z M1,0C0.447715,0 0,0.447715 0,1 0,1.55228 0.447715,2 1,2L15,2C15.5523,2 16,1.55228 16,1 16,0.447715 15.5523,0 15,0L1,0z M1,4C0.447715,4 0,4.44772 0,5 0,5.55228 0.447715,6 1,6L15,6C15.5523,6 16,5.55228 16,5 16,4.44772 15.5523,4 15,4L1,4z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTLBOpacityResetBtn"
|
||||
Click="PPTLBOpacityResetBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M24,24z M0,0z M12,2.01123C10.5428,2.01123 9.14528,2.5901 8.11488,3.6205 7.08449,4.65089 6.50562,6.04841 6.50562,7.50561L6.50562,16.4944C6.50562,17.9516 7.08449,19.3491 8.11488,20.3795 9.14528,21.4099 10.5428,21.9888 12,21.9888 13.4572,21.9888 14.8547,21.4099 15.8851,20.3795 16.9135,19.3511 17.4922,17.9569 17.4944,16.5027 17.4944,16.4999 17.4944,16.4972 17.4944,16.4944L17.4944,7.50563C17.4944,7.50285 17.4944,7.50007 17.4944,7.4973 17.4922,6.0431 16.9135,4.64893 15.8851,3.6205 14.8547,2.5901 13.4572,2.01123 12,2.01123z M9.5291,5.03471C10.1844,4.37939 11.0732,4.01123 12,4.01123 12.9268,4.01123 13.8156,4.37939 14.4709,5.03471 15.1262,5.69003 15.4944,6.57884 15.4944,7.50561L15.4944,16.4944C15.4944,17.4211 15.1262,18.31 14.4709,18.9653 13.8156,19.6206 12.9268,19.9888 12,19.9888 11.0732,19.9888 10.1844,19.6206 9.5291,18.9653 8.87377,18.31 8.50562,17.4211 8.50562,16.4944L8.50562,7.50561C8.50562,6.57884,8.87377,5.69003,9.5291,5.03471z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<TextBlock
|
||||
Text="{Binding ElementName=PPTLBButtonOpacityValueSlider, Path=Value, StringFormat='{}{0:F1}'}"
|
||||
VerticalAlignment="Center" FontSize="13"
|
||||
Margin="8,0,0,0" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="右下偏移" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,12,0" />
|
||||
@@ -1872,6 +2100,82 @@
|
||||
VerticalAlignment="Center" FontSize="13"
|
||||
Margin="8,0,16,0" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
|
||||
Name="PPTRBButtonOpacityPanel"
|
||||
Visibility="{Binding ElementName=CheckboxBPPTHalfOpacity, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
|
||||
<TextBlock Foreground="#fafafa" Text="右下透明度" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,12,0" />
|
||||
<Slider x:Name="PPTRBButtonOpacityValueSlider" Minimum="0.1"
|
||||
Maximum="1.0" Width="138" FontFamily="Microsoft YaHei UI"
|
||||
FontSize="20" IsSnapToTickEnabled="True" Value="0.5"
|
||||
TickFrequency="0.1"
|
||||
TickPlacement="None" AutoToolTipPlacement="None"
|
||||
ValueChanged="PPTRBButtonOpacityValueSlider_ValueChanged" />
|
||||
<Button Padding="5" Margin="8,0,0,0" Name="PPTRBOpacityPlusBtn"
|
||||
Click="PPTRBOpacityPlusBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V16 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,16z M0,0z M9,1C9,0.447715 8.55229,0 8,0 7.44772,0 7,0.447715 7,1L7,7 1,7C0.447715,7 0,7.44772 0,8 0,8.55229 0.447715,9 1,9L7,9 7,15C7,15.5523 7.44772,16 8,16 8.55229,16 9,15.5523 9,15L9,9 15,9C15.5523,9 16,8.55229 16,8 16,7.44772 15.5523,7 15,7L9,7 9,1z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTRBOpacityMinusBtn"
|
||||
Click="PPTRBOpacityMinusBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V2 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,2z M0,0z M0,1C0,0.447715,0.447715,0,1,0L15,0C15.5523,0 16,0.447715 16,1 16,1.55228 15.5523,2 15,2L1,2C0.447715,2,0,1.55228,0,1z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTRBOpacitySyncBtn"
|
||||
Click="PPTRBOpacitySyncBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V6 H16 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M16,6z M0,0z M1,0C0.447715,0 0,0.447715 0,1 0,1.55228 0.447715,2 1,2L15,2C15.5523,2 16,1.55228 16,1 16,0.447715 15.5523,0 15,0L1,0z M1,4C0.447715,4 0,4.44772 0,5 0,5.55228 0.447715,6 1,6L15,6C15.5523,6 16,5.55228 16,5 16,4.44772 15.5523,4 15,4L1,4z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<Button Margin="6,0,0,0" Padding="5" Name="PPTRBOpacityResetBtn"
|
||||
Click="PPTRBOpacityResetBtn_Clicked">
|
||||
<Image Width="16" Height="16">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#f4f4f5"
|
||||
Geometry="F0 M24,24z M0,0z M12,2.01123C10.5428,2.01123 9.14528,2.5901 8.11488,3.6205 7.08449,4.65089 6.50562,6.04841 6.50562,7.50561L6.50562,16.4944C6.50562,17.9516 7.08449,19.3491 8.11488,20.3795 9.14528,21.4099 10.5428,21.9888 12,21.9888 13.4572,21.9888 14.8547,21.4099 15.8851,20.3795 16.9135,19.3511 17.4922,17.9569 17.4944,16.5027 17.4944,16.4999 17.4944,16.4972 17.4944,16.4944L17.4944,7.50563C17.4944,7.50285 17.4944,7.50007 17.4944,7.4973 17.4922,6.0431 16.9135,4.64893 15.8851,3.6205 14.8547,2.5901 13.4572,2.01123 12,2.01123z M9.5291,5.03471C10.1844,4.37939 11.0732,4.01123 12,4.01123 12.9268,4.01123 13.8156,4.37939 14.4709,5.03471 15.1262,5.69003 15.4944,6.57884 15.4944,7.50561L15.4944,16.4944C15.4944,17.4211 15.1262,18.31 14.4709,18.9653 13.8156,19.6206 12.9268,19.9888 12,19.9888 11.0732,19.9888 10.1844,19.6206 9.5291,18.9653 8.87377,18.31 8.50562,17.4211 8.50562,16.4944L8.50562,7.50561C8.50562,6.57884,8.87377,5.69003,9.5291,5.03471z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</Button>
|
||||
<TextBlock
|
||||
Text="{Binding ElementName=PPTRBButtonOpacityValueSlider, Path=Value, StringFormat='{}{0:F1}'}"
|
||||
VerticalAlignment="Center" FontSize="13"
|
||||
Margin="8,0,0,0" />
|
||||
</ui:SimpleStackPanel>
|
||||
<TextBlock
|
||||
Text="# 调大往右偏移，调小往左偏移，修改为0为不偏移，居中放置"
|
||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||
|
||||
@@ -2731,6 +2731,10 @@ namespace Ink_Canvas
|
||||
PPTButtonRightPositionValueSlider,
|
||||
PPTButtonLBPositionValueSlider,
|
||||
PPTButtonRBPositionValueSlider,
|
||||
PPTLSButtonOpacityValueSlider,
|
||||
PPTRSButtonOpacityValueSlider,
|
||||
PPTLBButtonOpacityValueSlider,
|
||||
PPTRBButtonOpacityValueSlider,
|
||||
TouchMultiplierSlider,
|
||||
NibModeBoundsWidthSlider,
|
||||
FingerModeBoundsWidthSlider,
|
||||
|
||||
@@ -152,6 +152,10 @@ namespace Ink_Canvas
|
||||
_pptUIManager.PPTRBButtonPosition = Settings.PowerPointSettings.PPTRBButtonPosition;
|
||||
_pptUIManager.EnablePPTButtonPageClickable = Settings.PowerPointSettings.EnablePPTButtonPageClickable;
|
||||
_pptUIManager.EnablePPTButtonLongPressPageTurn = Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn;
|
||||
_pptUIManager.PPTLSButtonOpacity = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
_pptUIManager.PPTRSButtonOpacity = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
_pptUIManager.PPTLBButtonOpacity = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
_pptUIManager.PPTRBButtonOpacity = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
|
||||
LogHelper.WriteLogToFile("PPT管理器初始化完成", LogHelper.LogType.Event);
|
||||
}
|
||||
|
||||
@@ -646,6 +646,298 @@ namespace Ink_Canvas
|
||||
SaveSettingsToFile();
|
||||
}
|
||||
|
||||
private void PPTLSButtonOpacityValueSlider_ValueChanged(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
double roundedValue = Math.Round(PPTLSButtonOpacityValueSlider.Value, 1);
|
||||
PPTLSButtonOpacityValueSlider.Value = roundedValue;
|
||||
Settings.PowerPointSettings.PPTLSButtonOpacity = roundedValue;
|
||||
SaveSettingsToFile();
|
||||
// 更新PPT UI管理器设置
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLSButtonOpacity = roundedValue;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTRSButtonOpacityValueSlider_ValueChanged(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
double roundedValue = Math.Round(PPTRSButtonOpacityValueSlider.Value, 1);
|
||||
PPTRSButtonOpacityValueSlider.Value = roundedValue;
|
||||
Settings.PowerPointSettings.PPTRSButtonOpacity = roundedValue;
|
||||
SaveSettingsToFile();
|
||||
// 更新PPT UI管理器设置
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRSButtonOpacity = roundedValue;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTLBButtonOpacityValueSlider_ValueChanged(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
double roundedValue = Math.Round(PPTLBButtonOpacityValueSlider.Value, 1);
|
||||
PPTLBButtonOpacityValueSlider.Value = roundedValue;
|
||||
Settings.PowerPointSettings.PPTLBButtonOpacity = roundedValue;
|
||||
SaveSettingsToFile();
|
||||
// 更新PPT UI管理器设置
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLBButtonOpacity = roundedValue;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTRBButtonOpacityValueSlider_ValueChanged(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
double roundedValue = Math.Round(PPTRBButtonOpacityValueSlider.Value, 1);
|
||||
PPTRBButtonOpacityValueSlider.Value = roundedValue;
|
||||
Settings.PowerPointSettings.PPTRBButtonOpacity = roundedValue;
|
||||
SaveSettingsToFile();
|
||||
// 更新PPT UI管理器设置
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRBButtonOpacity = roundedValue;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
// 左侧透明度按钮
|
||||
private void PPTLSOpacityPlusBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTLSButtonOpacityValueSlider.Value = Math.Min(1.0, PPTLSButtonOpacityValueSlider.Value + 0.1);
|
||||
Settings.PowerPointSettings.PPTLSButtonOpacity = PPTLSButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLSButtonOpacity = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTLSOpacityMinusBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTLSButtonOpacityValueSlider.Value = Math.Max(0.1, PPTLSButtonOpacityValueSlider.Value - 0.1);
|
||||
Settings.PowerPointSettings.PPTLSButtonOpacity = PPTLSButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLSButtonOpacity = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTLSOpacitySyncBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTRSButtonOpacityValueSlider.Value = PPTLSButtonOpacityValueSlider.Value;
|
||||
Settings.PowerPointSettings.PPTRSButtonOpacity = PPTLSButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRSButtonOpacity = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
// 右侧透明度按钮
|
||||
private void PPTRSOpacityPlusBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTRSButtonOpacityValueSlider.Value = Math.Min(1.0, PPTRSButtonOpacityValueSlider.Value + 0.1);
|
||||
Settings.PowerPointSettings.PPTRSButtonOpacity = PPTRSButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRSButtonOpacity = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTRSOpacityMinusBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTRSButtonOpacityValueSlider.Value = Math.Max(0.1, PPTRSButtonOpacityValueSlider.Value - 0.1);
|
||||
Settings.PowerPointSettings.PPTRSButtonOpacity = PPTRSButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRSButtonOpacity = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTRSOpacitySyncBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTLSButtonOpacityValueSlider.Value = PPTRSButtonOpacityValueSlider.Value;
|
||||
Settings.PowerPointSettings.PPTLSButtonOpacity = PPTRSButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLSButtonOpacity = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
// 左下透明度按钮
|
||||
private void PPTLBOpacityPlusBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTLBButtonOpacityValueSlider.Value = Math.Min(1.0, PPTLBButtonOpacityValueSlider.Value + 0.1);
|
||||
Settings.PowerPointSettings.PPTLBButtonOpacity = PPTLBButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLBButtonOpacity = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTLBOpacityMinusBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTLBButtonOpacityValueSlider.Value = Math.Max(0.1, PPTLBButtonOpacityValueSlider.Value - 0.1);
|
||||
Settings.PowerPointSettings.PPTLBButtonOpacity = PPTLBButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLBButtonOpacity = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTLBOpacitySyncBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTRBButtonOpacityValueSlider.Value = PPTLBButtonOpacityValueSlider.Value;
|
||||
Settings.PowerPointSettings.PPTRBButtonOpacity = PPTLBButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRBButtonOpacity = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
// 右下透明度按钮
|
||||
private void PPTRBOpacityPlusBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTRBButtonOpacityValueSlider.Value = Math.Min(1.0, PPTRBButtonOpacityValueSlider.Value + 0.1);
|
||||
Settings.PowerPointSettings.PPTRBButtonOpacity = PPTRBButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRBButtonOpacity = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTRBOpacityMinusBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTRBButtonOpacityValueSlider.Value = Math.Max(0.1, PPTRBButtonOpacityValueSlider.Value - 0.1);
|
||||
Settings.PowerPointSettings.PPTRBButtonOpacity = PPTRBButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRBButtonOpacity = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTRBOpacitySyncBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTLBButtonOpacityValueSlider.Value = PPTRBButtonOpacityValueSlider.Value;
|
||||
Settings.PowerPointSettings.PPTLBButtonOpacity = PPTRBButtonOpacityValueSlider.Value;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLBButtonOpacity = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTLSOpacityResetBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTLSButtonOpacityValueSlider.Value = 0.5;
|
||||
Settings.PowerPointSettings.PPTLSButtonOpacity = 0.5;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLSButtonOpacity = 0.5;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTRSOpacityResetBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTRSButtonOpacityValueSlider.Value = 0.5;
|
||||
Settings.PowerPointSettings.PPTRSButtonOpacity = 0.5;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRSButtonOpacity = 0.5;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTLBOpacityResetBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTLBButtonOpacityValueSlider.Value = 0.5;
|
||||
Settings.PowerPointSettings.PPTLBButtonOpacity = 0.5;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTLBButtonOpacity = 0.5;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void PPTRBOpacityResetBtn_Clicked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
PPTRBButtonOpacityValueSlider.Value = 0.5;
|
||||
Settings.PowerPointSettings.PPTRBButtonOpacity = 0.5;
|
||||
SaveSettingsToFile();
|
||||
if (_pptUIManager != null)
|
||||
{
|
||||
_pptUIManager.PPTRBButtonOpacity = 0.5;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
}
|
||||
|
||||
private void CheckboxEnableLBPPTButton_IsCheckChanged(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (!isLoaded) return;
|
||||
@@ -736,13 +1028,37 @@ namespace Ink_Canvas
|
||||
if (!isLoaded) return;
|
||||
var str = Settings.PowerPointSettings.PPTSButtonsOption.ToString();
|
||||
char[] c = str.ToCharArray();
|
||||
c[1] = (bool)((CheckBox)sender).IsChecked ? '2' : '1';
|
||||
bool isHalfOpacity = (bool)((CheckBox)sender).IsChecked;
|
||||
c[1] = isHalfOpacity ? '2' : '1';
|
||||
Settings.PowerPointSettings.PPTSButtonsOption = int.Parse(new string(c));
|
||||
|
||||
// 如果开启半透明选项，设置默认透明度为0.5；否则为1.0
|
||||
if (isHalfOpacity)
|
||||
{
|
||||
if (Settings.PowerPointSettings.PPTLSButtonOpacity == 1.0)
|
||||
Settings.PowerPointSettings.PPTLSButtonOpacity = 0.5;
|
||||
if (Settings.PowerPointSettings.PPTRSButtonOpacity == 1.0)
|
||||
Settings.PowerPointSettings.PPTRSButtonOpacity = 0.5;
|
||||
PPTLSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
PPTRSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Settings.PowerPointSettings.PPTLSButtonOpacity == 0.5)
|
||||
Settings.PowerPointSettings.PPTLSButtonOpacity = 1.0;
|
||||
if (Settings.PowerPointSettings.PPTRSButtonOpacity == 0.5)
|
||||
Settings.PowerPointSettings.PPTRSButtonOpacity = 1.0;
|
||||
PPTLSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
PPTRSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
}
|
||||
|
||||
SaveSettingsToFile();
|
||||
// 更新PPT UI管理器设置
|
||||
if (_pptUIManager != null && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
|
||||
{
|
||||
_pptUIManager.PPTSButtonsOption = Settings.PowerPointSettings.PPTSButtonsOption;
|
||||
_pptUIManager.PPTLSButtonOpacity = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
_pptUIManager.PPTRSButtonOpacity = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
UpdatePPTBtnPreview();
|
||||
@@ -787,8 +1103,30 @@ namespace Ink_Canvas
|
||||
if (!isLoaded) return;
|
||||
var str = Settings.PowerPointSettings.PPTBButtonsOption.ToString();
|
||||
char[] c = str.ToCharArray();
|
||||
c[1] = (bool)((CheckBox)sender).IsChecked ? '2' : '1';
|
||||
bool isHalfOpacity = (bool)((CheckBox)sender).IsChecked;
|
||||
c[1] = isHalfOpacity ? '2' : '1';
|
||||
Settings.PowerPointSettings.PPTBButtonsOption = int.Parse(new string(c));
|
||||
|
||||
// 如果开启半透明选项，设置默认透明度为0.5；否则为1.0
|
||||
if (isHalfOpacity)
|
||||
{
|
||||
if (Settings.PowerPointSettings.PPTLBButtonOpacity == 1.0)
|
||||
Settings.PowerPointSettings.PPTLBButtonOpacity = 0.5;
|
||||
if (Settings.PowerPointSettings.PPTRBButtonOpacity == 1.0)
|
||||
Settings.PowerPointSettings.PPTRBButtonOpacity = 0.5;
|
||||
PPTLBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
PPTRBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Settings.PowerPointSettings.PPTLBButtonOpacity == 0.5)
|
||||
Settings.PowerPointSettings.PPTLBButtonOpacity = 1.0;
|
||||
if (Settings.PowerPointSettings.PPTRBButtonOpacity == 0.5)
|
||||
Settings.PowerPointSettings.PPTRBButtonOpacity = 1.0;
|
||||
PPTLBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
PPTRBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
}
|
||||
|
||||
SaveSettingsToFile();
|
||||
UpdatePPTUIManagerSettings();
|
||||
UpdatePPTBtnPreview();
|
||||
@@ -1020,6 +1358,10 @@ namespace Ink_Canvas
|
||||
_pptUIManager.PPTRBButtonPosition = Settings.PowerPointSettings.PPTRBButtonPosition;
|
||||
_pptUIManager.EnablePPTButtonPageClickable = Settings.PowerPointSettings.EnablePPTButtonPageClickable;
|
||||
_pptUIManager.EnablePPTButtonLongPressPageTurn = Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn;
|
||||
_pptUIManager.PPTLSButtonOpacity = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
_pptUIManager.PPTRSButtonOpacity = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
_pptUIManager.PPTLBButtonOpacity = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
_pptUIManager.PPTRBButtonOpacity = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
_pptUIManager.UpdateNavigationPanelsVisibility();
|
||||
_pptUIManager.UpdateNavigationButtonStyles();
|
||||
}
|
||||
@@ -1030,16 +1372,9 @@ namespace Ink_Canvas
|
||||
//new BitmapImage(new Uri("pack://application:,,,/Resources/new-icons/unfold-chevron.png"));
|
||||
var bopt = Settings.PowerPointSettings.PPTBButtonsOption.ToString();
|
||||
char[] boptc = bopt.ToCharArray();
|
||||
if (boptc[1] == '2')
|
||||
{
|
||||
PPTBtnPreviewLB.Opacity = 0.5;
|
||||
PPTBtnPreviewRB.Opacity = 0.5;
|
||||
}
|
||||
else
|
||||
{
|
||||
PPTBtnPreviewLB.Opacity = 1;
|
||||
PPTBtnPreviewRB.Opacity = 1;
|
||||
}
|
||||
// 使用实际的透明度设置值
|
||||
PPTBtnPreviewLB.Opacity = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
PPTBtnPreviewRB.Opacity = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
|
||||
if (boptc[2] == '2')
|
||||
{
|
||||
@@ -1060,16 +1395,8 @@ namespace Ink_Canvas
|
||||
|
||||
var sopt = Settings.PowerPointSettings.PPTSButtonsOption.ToString();
|
||||
char[] soptc = sopt.ToCharArray();
|
||||
if (soptc[1] == '2')
|
||||
{
|
||||
PPTBtnPreviewLS.Opacity = 0.5;
|
||||
PPTBtnPreviewRS.Opacity = 0.5;
|
||||
}
|
||||
else
|
||||
{
|
||||
PPTBtnPreviewLS.Opacity = 1;
|
||||
PPTBtnPreviewRS.Opacity = 1;
|
||||
}
|
||||
PPTBtnPreviewLS.Opacity = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
PPTBtnPreviewRS.Opacity = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
|
||||
if (soptc[2] == '2')
|
||||
{
|
||||
|
||||
@@ -553,6 +553,38 @@ namespace Ink_Canvas
|
||||
|
||||
PPTButtonRBPositionValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonPosition;
|
||||
|
||||
// 初始化PPT翻页按钮透明度滑块值，根据半透明选项设置默认值
|
||||
// 重用之前定义的sopsc和bopsc变量
|
||||
bool isSideHalfOpacity = sopsc.Length >= 2 && sopsc[1] == '2';
|
||||
// 如果透明度为0或未设置，根据半透明选项设置默认值
|
||||
if (Settings.PowerPointSettings.PPTLSButtonOpacity == 0.0 ||
|
||||
(Settings.PowerPointSettings.PPTLSButtonOpacity == 1.0 && isSideHalfOpacity))
|
||||
{
|
||||
Settings.PowerPointSettings.PPTLSButtonOpacity = isSideHalfOpacity ? 0.5 : 1.0;
|
||||
}
|
||||
if (Settings.PowerPointSettings.PPTRSButtonOpacity == 0.0 ||
|
||||
(Settings.PowerPointSettings.PPTRSButtonOpacity == 1.0 && isSideHalfOpacity))
|
||||
{
|
||||
Settings.PowerPointSettings.PPTRSButtonOpacity = isSideHalfOpacity ? 0.5 : 1.0;
|
||||
}
|
||||
PPTLSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLSButtonOpacity;
|
||||
PPTRSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRSButtonOpacity;
|
||||
|
||||
bool isBottomHalfOpacity = bopsc.Length >= 2 && bopsc[1] == '2';
|
||||
// 如果透明度为0或未设置，根据半透明选项设置默认值
|
||||
if (Settings.PowerPointSettings.PPTLBButtonOpacity == 0.0 ||
|
||||
(Settings.PowerPointSettings.PPTLBButtonOpacity == 1.0 && isBottomHalfOpacity))
|
||||
{
|
||||
Settings.PowerPointSettings.PPTLBButtonOpacity = isBottomHalfOpacity ? 0.5 : 1.0;
|
||||
}
|
||||
if (Settings.PowerPointSettings.PPTRBButtonOpacity == 0.0 ||
|
||||
(Settings.PowerPointSettings.PPTRBButtonOpacity == 1.0 && isBottomHalfOpacity))
|
||||
{
|
||||
Settings.PowerPointSettings.PPTRBButtonOpacity = isBottomHalfOpacity ? 0.5 : 1.0;
|
||||
}
|
||||
PPTLBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLBButtonOpacity;
|
||||
PPTRBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonOpacity;
|
||||
|
||||
UpdatePPTBtnSlidersStatus();
|
||||
|
||||
UpdatePPTBtnPreview();
|
||||
|
||||
@@ -285,6 +285,18 @@ namespace Ink_Canvas
|
||||
[JsonProperty("enablePPTButtonLongPressPageTurn")]
|
||||
public bool EnablePPTButtonLongPressPageTurn { get; set; } = true;
|
||||
|
||||
[JsonProperty("pptLSButtonOpacity")]
|
||||
public double PPTLSButtonOpacity { get; set; } = 0.5;
|
||||
|
||||
[JsonProperty("pptRSButtonOpacity")]
|
||||
public double PPTRSButtonOpacity { get; set; } = 0.5;
|
||||
|
||||
[JsonProperty("pptLBButtonOpacity")]
|
||||
public double PPTLBButtonOpacity { get; set; } = 0.5;
|
||||
|
||||
[JsonProperty("pptRBButtonOpacity")]
|
||||
public double PPTRBButtonOpacity { get; set; } = 0.5;
|
||||
|
||||
// -- new --
|
||||
|
||||
[JsonProperty("powerPointSupport")]
|
||||
|
||||
Reference in New Issue
Block a user