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

feat(UI): 统一调整设置页面滑块控件布局和样式

Browse Source 
调整多个设置页面的滑块控件布局，统一使用SimpleStackPanel水平排列滑块和数值显示文本，增加数值显示的Consolas字体样式，并统一滑块宽度为200像素
This commit is contained in:
PrefacedCorg
2026-05-01 00:36:41 +08:00
parent e55f8e8ea1
commit 2c0b09a9ad
6 changed files with 154 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Windows/SettingsViews/Pages/AdvancedPage.xaml
+28 -16
View File
@@ -51,12 +51,16 @@
<ui:SettingsExpander.HeaderIcon> <ui:SettingsExpander.HeaderIcon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Touch}" /> <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Touch}" />
</ui:SettingsExpander.HeaderIcon> </ui:SettingsExpander.HeaderIcon>
<Slider x:Name="TouchMultiplierSlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="0" Maximum="2" <TextBlock Text="{Binding Value, ElementName=TouchMultiplierSlider, StringFormat={}{0:F2}}"
Width="200" VerticalAlignment="Center" FontFamily="Consolas"/>
IsSnapToTickEnabled="True" <Slider x:Name="TouchMultiplierSlider"
TickFrequency="0.01" TickPlacement="None" Minimum="0" Maximum="2"
ValueChanged="TouchMultiplierSlider_ValueChanged" /> Width="200"
IsSnapToTickEnabled="True"
TickFrequency="0.01" TickPlacement="None"
ValueChanged="TouchMultiplierSlider_ValueChanged" />
</ikw:SimpleStackPanel>
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_TouchMultiplierCalibrateHint}" <ui:SettingsCard Header="{i18n:I18n Key=Advanced_TouchMultiplierCalibrateHint}"
ContentAlignment="Left"> ContentAlignment="Left">
@@ -81,19 +85,27 @@
Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled"/> Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled"/>
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_NibModeBoundsWidthHeader}"> <ui:SettingsCard Header="{i18n:I18n Key=Advanced_NibModeBoundsWidthHeader}">
<Slider x:Name="NibModeBoundsWidthSlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="1" Maximum="50" Width="200" <TextBlock Text="{Binding Value, ElementName=NibModeBoundsWidthSlider}"
IsSnapToTickEnabled="True" TickFrequency="1" Value="5" VerticalAlignment="Center" FontFamily="Consolas"/>
TickPlacement="None" <Slider x:Name="NibModeBoundsWidthSlider"
ValueChanged="NibModeBoundsWidthSlider_ValueChanged" /> Minimum="1" Maximum="50" Width="200"
IsSnapToTickEnabled="True" TickFrequency="1" Value="5"
TickPlacement="None"
ValueChanged="NibModeBoundsWidthSlider_ValueChanged" />
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_FingerModeBoundsWidthHeader}"> <ui:SettingsCard Header="{i18n:I18n Key=Advanced_FingerModeBoundsWidthHeader}">
<Slider x:Name="FingerModeBoundsWidthSlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="1" Maximum="50" Width="200" <TextBlock Text="{Binding Value, ElementName=FingerModeBoundsWidthSlider}"
IsSnapToTickEnabled="True" TickFrequency="1" Value="20" VerticalAlignment="Center" FontFamily="Consolas"/>
TickPlacement="None" <Slider x:Name="FingerModeBoundsWidthSlider"
ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" /> Minimum="1" Maximum="50" Width="200"
IsSnapToTickEnabled="True" TickFrequency="1" Value="20"
TickPlacement="None"
ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" />
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<controls:LabeledSettingsCard x:Name="ToggleSwitchIsQuadIR" <controls:LabeledSettingsCard x:Name="ToggleSwitchIsQuadIR"
Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml
+6 -6
View File
@@ -125,7 +125,7 @@
<TextBlock Text="{Binding ElementName=ViewboxFloatingBarScaleTransformValueSlider, Path=Value, StringFormat={}{0:F2}}" <TextBlock Text="{Binding ElementName=ViewboxFloatingBarScaleTransformValueSlider, Path=Value, StringFormat={}{0:F2}}"
VerticalAlignment="Center" FontFamily="Consolas"/> VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="ViewboxFloatingBarScaleTransformValueSlider" Minimum="0.5" <Slider x:Name="ViewboxFloatingBarScaleTransformValueSlider" Minimum="0.5"
Maximum="1.25" Width="168" Maximum="1.25" Width="200"
IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
TickPlacement="None" AutoToolTipPlacement="None" TickPlacement="None" AutoToolTipPlacement="None"
ValueChanged="ViewboxFloatingBarScaleTransformValueSlider_ValueChanged" /> ValueChanged="ViewboxFloatingBarScaleTransformValueSlider_ValueChanged" />
@@ -140,7 +140,7 @@
<TextBlock Text="{Binding ElementName=ViewboxFloatingBarOpacityValueSlider, Path=Value, StringFormat={}{0:F2}}" <TextBlock Text="{Binding ElementName=ViewboxFloatingBarOpacityValueSlider, Path=Value, StringFormat={}{0:F2}}"
VerticalAlignment="Center" FontFamily="Consolas"/> VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="ViewboxFloatingBarOpacityValueSlider" Minimum="0.3" <Slider x:Name="ViewboxFloatingBarOpacityValueSlider" Minimum="0.3"
Maximum="1" Width="168" Maximum="1" Width="200"
IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
TickPlacement="None" AutoToolTipPlacement="None" TickPlacement="None" AutoToolTipPlacement="None"
ValueChanged="ViewboxFloatingBarOpacityValueSlider_ValueChanged" /> ValueChanged="ViewboxFloatingBarOpacityValueSlider_ValueChanged" />
@@ -153,13 +153,13 @@
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Play}" /> <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Play}" />
</ui:SettingsCard.HeaderIcon> </ui:SettingsCard.HeaderIcon>
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8"> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=ViewboxFloatingBarOpacityInPPTValueSlider, Path=Value, StringFormat={}{0:F2}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="ViewboxFloatingBarOpacityInPPTValueSlider" Minimum="0.3" <Slider x:Name="ViewboxFloatingBarOpacityInPPTValueSlider" Minimum="0.3"
Maximum="1" Width="168" Maximum="1" Width="200"
IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
TickPlacement="None" AutoToolTipPlacement="None" TickPlacement="None" AutoToolTipPlacement="None"
ValueChanged="ViewboxFloatingBarOpacityInPPTValueSlider_ValueChanged" /> ValueChanged="ViewboxFloatingBarOpacityInPPTValueSlider_ValueChanged" />
<TextBlock Text="{Binding ElementName=ViewboxFloatingBarOpacityInPPTValueSlider, Path=Value}"
VerticalAlignment="Center" FontFamily="Consolas" Width="40" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
@@ -177,7 +177,7 @@
<TextBlock Text="{Binding ElementName=ViewboxBlackBoardScaleTransformValueSlider, Path=Value, StringFormat={}{0:F2}}" <TextBlock Text="{Binding ElementName=ViewboxBlackBoardScaleTransformValueSlider, Path=Value, StringFormat={}{0:F2}}"
VerticalAlignment="Center" FontFamily="Consolas"/> VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="ViewboxBlackBoardScaleTransformValueSlider" Minimum="0.5" <Slider x:Name="ViewboxBlackBoardScaleTransformValueSlider" Minimum="0.5"
Maximum="1.5" Width="168" Maximum="1.5" Width="200"
IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
TickPlacement="None" AutoToolTipPlacement="None" TickPlacement="None" AutoToolTipPlacement="None"
ValueChanged="ViewboxBlackBoardScaleTransformValueSlider_ValueChanged" /> ValueChanged="ViewboxBlackBoardScaleTransformValueSlider_ValueChanged" />
Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml
+14 -14
View File
@@ -146,12 +146,12 @@
Toggled="ToggleSwitchEnableInkFade_Toggled" /> Toggled="ToggleSwitchEnableInkFade_Toggled" />
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=Canvas_InkFadeTime}"> <ui:SettingsCard Header="{i18n:I18n Key=Canvas_InkFadeTime}">
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12"> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<Slider x:Name="InkFadeTimeSlider" Width="150" Minimum="1000" Maximum="10000" <TextBlock Text="{Binding Value, ElementName=InkFadeTimeSlider, StringFormat={}{0:0}ms}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="InkFadeTimeSlider" Width="200" Minimum="1000" Maximum="10000"
Value="3000" TickFrequency="1000" IsSnapToTickEnabled="True" Value="3000" TickFrequency="1000" IsSnapToTickEnabled="True"
ValueChanged="InkFadeTimeSlider_ValueChanged" /> ValueChanged="InkFadeTimeSlider_ValueChanged" />
<TextBlock Text="{Binding Value, ElementName=InkFadeTimeSlider, StringFormat={}{0:0}ms}"
VerticalAlignment="Center" FontSize="14" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
@@ -195,21 +195,21 @@
</ComboBox> </ComboBox>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Canvas_RestoreWidth}"> <ui:SettingsCard Header="{i18n:I18n Key=Canvas_RestoreWidth}">
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12"> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding Value, ElementName=BrushAutoRestoreWidthSlider, StringFormat={}{0:F2}px}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="BrushAutoRestoreWidthSlider" Width="200" Minimum="1" Maximum="20" <Slider x:Name="BrushAutoRestoreWidthSlider" Width="200" Minimum="1" Maximum="20"
TickFrequency="1" IsSnapToTickEnabled="True" Value="5" TickFrequency="1" IsSnapToTickEnabled="True" Value="5"
ValueChanged="BrushAutoRestoreWidthSlider_ValueChanged" /> ValueChanged="BrushAutoRestoreWidthSlider_ValueChanged" />
<TextBlock Text="{Binding Value, ElementName=BrushAutoRestoreWidthSlider, StringFormat={}{0:0}px}"
FontSize="12" VerticalAlignment="Center" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Canvas_RestoreOpacity}"> <ui:SettingsCard Header="{i18n:I18n Key=Canvas_RestoreOpacity}">
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12"> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding Value, ElementName=BrushAutoRestoreAlphaSlider, StringFormat={}{0:0}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="BrushAutoRestoreAlphaSlider" Width="200" Minimum="0" Maximum="255" <Slider x:Name="BrushAutoRestoreAlphaSlider" Width="200" Minimum="0" Maximum="255"
TickFrequency="5" IsSnapToTickEnabled="True" TickFrequency="5" IsSnapToTickEnabled="True"
ValueChanged="BrushAutoRestoreAlphaSlider_ValueChanged" /> ValueChanged="BrushAutoRestoreAlphaSlider_ValueChanged" />
<TextBlock Text="{Binding Value, ElementName=BrushAutoRestoreAlphaSlider, StringFormat={}{0:0}}"
FontSize="12" VerticalAlignment="Center" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
@@ -229,12 +229,12 @@
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=Canvas_SwitchBackDelay}" <ui:SettingsCard Header="{i18n:I18n Key=Canvas_SwitchBackDelay}"
Description="{i18n:I18n Key=Canvas_SwitchBackDelayHint}"> Description="{i18n:I18n Key=Canvas_SwitchBackDelayHint}">
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12"> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<Slider x:Name="EraserAutoSwitchBackDelaySlider" Width="150" Minimum="1" Maximum="60" <TextBlock Text="{Binding Value, ElementName=EraserAutoSwitchBackDelaySlider, StringFormat={}{0:0}秒}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="EraserAutoSwitchBackDelaySlider" Width="200" Minimum="1" Maximum="60"
Value="10" TickFrequency="1" IsSnapToTickEnabled="True" Value="10" TickFrequency="1" IsSnapToTickEnabled="True"
ValueChanged="EraserAutoSwitchBackDelaySlider_ValueChanged" /> ValueChanged="EraserAutoSwitchBackDelaySlider_ValueChanged" />
<TextBlock Text="{Binding Value, ElementName=EraserAutoSwitchBackDelaySlider, StringFormat={}{0:0}秒}"
VerticalAlignment="Center" FontSize="14" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
Ink Canvas/Windows/SettingsViews/Pages/InkRecognitionPage.xaml
+12 -12
View File
@@ -112,21 +112,21 @@
Toggled="ToggleSwitchAutoStraightenLine_Toggled" /> Toggled="ToggleSwitchAutoStraightenLine_Toggled" />
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=InkRecog_LengthThreshold}"> <ui:SettingsCard Header="{i18n:I18n Key=InkRecog_LengthThreshold}">
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12"> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<Slider x:Name="AutoStraightenLineThresholdSlider" Width="150" Minimum="30" Maximum="300" <TextBlock Text="{Binding Value, ElementName=AutoStraightenLineThresholdSlider, StringFormat={}{0:0}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="AutoStraightenLineThresholdSlider" Width="200" Minimum="30" Maximum="300"
Value="80" TickFrequency="30" IsSnapToTickEnabled="True" Value="80" TickFrequency="30" IsSnapToTickEnabled="True"
ValueChanged="AutoStraightenLineThresholdSlider_ValueChanged" /> ValueChanged="AutoStraightenLineThresholdSlider_ValueChanged" />
<TextBlock Text="{Binding Value, ElementName=AutoStraightenLineThresholdSlider, StringFormat={}{0:0}}"
VerticalAlignment="Center" FontSize="14" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=InkRecog_Sensitivity}"> <ui:SettingsCard Header="{i18n:I18n Key=InkRecog_Sensitivity}">
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12"> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<Slider x:Name="LineStraightenSensitivitySlider" Width="150" Minimum="0.05" Maximum="2.0" <TextBlock Text="{Binding Value, ElementName=LineStraightenSensitivitySlider, StringFormat={}{0:F2}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="LineStraightenSensitivitySlider" Width="200" Minimum="0.05" Maximum="2.0"
Value="0.20" TickFrequency="0.05" IsSnapToTickEnabled="True" Value="0.20" TickFrequency="0.05" IsSnapToTickEnabled="True"
ValueChanged="LineStraightenSensitivitySlider_ValueChanged" /> ValueChanged="LineStraightenSensitivitySlider_ValueChanged" />
<TextBlock Text="{Binding Value, ElementName=LineStraightenSensitivitySlider, StringFormat={}{0:F2}}"
VerticalAlignment="Center" FontSize="14" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=InkRecog_HighPrecisionStraighten}" <ui:SettingsCard Header="{i18n:I18n Key=InkRecog_HighPrecisionStraighten}"
@@ -152,12 +152,12 @@
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=InkRecog_SnappingDistance}" <ui:SettingsCard Header="{i18n:I18n Key=InkRecog_SnappingDistance}"
Description="{i18n:I18n Key=InkRecog_LineEndpointSnappingHint}"> Description="{i18n:I18n Key=InkRecog_LineEndpointSnappingHint}">
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12"> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<Slider x:Name="LineEndpointSnappingThresholdSlider" Width="150" Minimum="5" Maximum="50" <TextBlock Text="{Binding Value, ElementName=LineEndpointSnappingThresholdSlider, StringFormat={}{0:0}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="LineEndpointSnappingThresholdSlider" Width="200" Minimum="5" Maximum="50"
Value="15" TickFrequency="5" IsSnapToTickEnabled="True" Value="15" TickFrequency="5" IsSnapToTickEnabled="True"
ValueChanged="LineEndpointSnappingThresholdSlider_ValueChanged" /> ValueChanged="LineEndpointSnappingThresholdSlider_ValueChanged" />
<TextBlock Text="{Binding Value, ElementName=LineEndpointSnappingThresholdSlider, StringFormat={}{0:0}}"
VerticalAlignment="Center" FontSize="14" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml
+40 -8
View File
@@ -82,10 +82,18 @@
</ui:SettingsExpander.Content> </ui:SettingsExpander.Content>
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=PPT_LeftOffset}"> <ui:SettingsCard Header="{i18n:I18n Key=PPT_LeftOffset}">
<Slider x:Name="PPTButtonLeftPositionValueSlider" Minimum="-500" Maximum="500" Width="200" ValueChanged="PPTButtonLeftPositionValueSlider_ValueChanged"/> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=PPTButtonLeftPositionValueSlider, Path=Value}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="PPTButtonLeftPositionValueSlider" Minimum="-500" Maximum="500" Width="200" ValueChanged="PPTButtonLeftPositionValueSlider_ValueChanged"/>
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=PPT_LeftOpacity}" Visibility="{Binding IsChecked, ElementName=CheckboxSPPTHalfOpacity, Converter={StaticResource BooleanToVisibilityConverter}}"> <ui:SettingsCard Header="{i18n:I18n Key=PPT_LeftOpacity}" Visibility="{Binding IsChecked, ElementName=CheckboxSPPTHalfOpacity, Converter={StaticResource BooleanToVisibilityConverter}}">
<Slider x:Name="PPTLSButtonOpacityValueSlider" Minimum="0.1" Maximum="1.0" Width="200" ValueChanged="PPTLSButtonOpacityValueSlider_ValueChanged"/> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=PPTLSButtonOpacityValueSlider, Path=Value, StringFormat={}{0:F1}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="PPTLSButtonOpacityValueSlider" Minimum="0.1" Maximum="1.0" Width="200" ValueChanged="PPTLSButtonOpacityValueSlider_ValueChanged"/>
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
</ui:SettingsExpander> </ui:SettingsExpander>
@@ -101,10 +109,18 @@
</ui:SettingsExpander.Content> </ui:SettingsExpander.Content>
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=PPT_RightOffset}"> <ui:SettingsCard Header="{i18n:I18n Key=PPT_RightOffset}">
<Slider x:Name="PPTButtonRightPositionValueSlider" Minimum="-500" Maximum="500" Width="200" ValueChanged="PPTButtonRightPositionValueSlider_ValueChanged"/> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=PPTButtonRightPositionValueSlider, Path=Value}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="PPTButtonRightPositionValueSlider" Minimum="-500" Maximum="500" Width="200" ValueChanged="PPTButtonRightPositionValueSlider_ValueChanged"/>
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=PPT_RightOpacity}" Visibility="{Binding IsChecked, ElementName=CheckboxSPPTHalfOpacity, Converter={StaticResource BooleanToVisibilityConverter}}"> <ui:SettingsCard Header="{i18n:I18n Key=PPT_RightOpacity}" Visibility="{Binding IsChecked, ElementName=CheckboxSPPTHalfOpacity, Converter={StaticResource BooleanToVisibilityConverter}}">
<Slider x:Name="PPTRSButtonOpacityValueSlider" Minimum="0.1" Maximum="1.0" Width="200" ValueChanged="PPTRSButtonOpacityValueSlider_ValueChanged"/> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=PPTRSButtonOpacityValueSlider, Path=Value, StringFormat={}{0:F1}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="PPTRSButtonOpacityValueSlider" Minimum="0.1" Maximum="1.0" Width="200" ValueChanged="PPTRSButtonOpacityValueSlider_ValueChanged"/>
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
</ui:SettingsExpander> </ui:SettingsExpander>
@@ -120,10 +136,18 @@
</ui:SettingsExpander.Content> </ui:SettingsExpander.Content>
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=PPT_LeftBottomOffset}"> <ui:SettingsCard Header="{i18n:I18n Key=PPT_LeftBottomOffset}">
<Slider x:Name="PPTButtonLBPositionValueSlider" Minimum="-500" Maximum="500" Width="200" ValueChanged="PPTButtonLBPositionValueSlider_ValueChanged"/> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=PPTButtonLBPositionValueSlider, Path=Value}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="PPTButtonLBPositionValueSlider" Minimum="-500" Maximum="500" Width="200" ValueChanged="PPTButtonLBPositionValueSlider_ValueChanged"/>
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=PPT_LeftBottomOpacity}" Visibility="{Binding IsChecked, ElementName=CheckboxBPPTHalfOpacity, Converter={StaticResource BooleanToVisibilityConverter}}"> <ui:SettingsCard Header="{i18n:I18n Key=PPT_LeftBottomOpacity}" Visibility="{Binding IsChecked, ElementName=CheckboxBPPTHalfOpacity, Converter={StaticResource BooleanToVisibilityConverter}}">
<Slider x:Name="PPTLBButtonOpacityValueSlider" Minimum="0.1" Maximum="1.0" Width="200" ValueChanged="PPTLBButtonOpacityValueSlider_ValueChanged"/> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=PPTLBButtonOpacityValueSlider, Path=Value, StringFormat={}{0:F1}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="PPTLBButtonOpacityValueSlider" Minimum="0.1" Maximum="1.0" Width="200" ValueChanged="PPTLBButtonOpacityValueSlider_ValueChanged"/>
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
</ui:SettingsExpander> </ui:SettingsExpander>
@@ -139,10 +163,18 @@
</ui:SettingsExpander.Content> </ui:SettingsExpander.Content>
<ui:SettingsExpander.Items> <ui:SettingsExpander.Items>
<ui:SettingsCard Header="{i18n:I18n Key=PPT_RightBottomOffset}"> <ui:SettingsCard Header="{i18n:I18n Key=PPT_RightBottomOffset}">
<Slider x:Name="PPTButtonRBPositionValueSlider" Minimum="-500" Maximum="500" Width="200" ValueChanged="PPTButtonRBPositionValueSlider_ValueChanged"/> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=PPTButtonRBPositionValueSlider, Path=Value}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="PPTButtonRBPositionValueSlider" Minimum="-500" Maximum="500" Width="200" ValueChanged="PPTButtonRBPositionValueSlider_ValueChanged"/>
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=PPT_RightBottomOpacity}" Visibility="{Binding IsChecked, ElementName=CheckboxBPPTHalfOpacity, Converter={StaticResource BooleanToVisibilityConverter}}"> <ui:SettingsCard Header="{i18n:I18n Key=PPT_RightBottomOpacity}" Visibility="{Binding IsChecked, ElementName=CheckboxBPPTHalfOpacity, Converter={StaticResource BooleanToVisibilityConverter}}">
<Slider x:Name="PPTRBButtonOpacityValueSlider" Minimum="0.1" Maximum="1.0" Width="200" ValueChanged="PPTRBButtonOpacityValueSlider_ValueChanged"/> <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding ElementName=PPTRBButtonOpacityValueSlider, Path=Value, StringFormat={}{0:F1}}"
VerticalAlignment="Center" FontFamily="Consolas"/>
<Slider x:Name="PPTRBButtonOpacityValueSlider" Minimum="0.1" Maximum="1.0" Width="200" ValueChanged="PPTRBButtonOpacityValueSlider_ValueChanged"/>
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
</ui:SettingsExpander> </ui:SettingsExpander>
Ink Canvas/Windows/SettingsViews/Pages/RandomDrawPage.xaml
+54 -30
View File
@@ -64,19 +64,27 @@
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_OnceCloseDelay}"> <ui:SettingsCard Header="{i18n:I18n Key=Random_OnceCloseDelay}">
<Slider x:Name="RandWindowOnceCloseLatencySlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="0.5" Maximum="8" Width="200" <TextBlock Text="{Binding ElementName=RandWindowOnceCloseLatencySlider, Path=Value, StringFormat={}{0:F1}}"
IsSnapToTickEnabled="True" Value="2.5" VerticalAlignment="Center" FontFamily="Consolas"/>
TickFrequency="0.1" TickPlacement="None" <Slider x:Name="RandWindowOnceCloseLatencySlider"
ValueChanged="RandWindowOnceCloseLatencySlider_ValueChanged" /> Minimum="0.5" Maximum="8" Width="200"
IsSnapToTickEnabled="True" Value="2.5"
TickFrequency="0.1" TickPlacement="None"
ValueChanged="RandWindowOnceCloseLatencySlider_ValueChanged" />
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_OnceMaxStudents}"> <ui:SettingsCard Header="{i18n:I18n Key=Random_OnceMaxStudents}">
<Slider x:Name="RandWindowOnceMaxStudentsSlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="0" Maximum="20" Width="200" <TextBlock Text="{Binding ElementName=RandWindowOnceMaxStudentsSlider, Path=Value}"
IsSnapToTickEnabled="True" Value="10" TickFrequency="1" VerticalAlignment="Center" FontFamily="Consolas"/>
TickPlacement="None" <Slider x:Name="RandWindowOnceMaxStudentsSlider"
ValueChanged="RandWindowOnceMaxStudentsSlider_ValueChanged" /> Minimum="0" Maximum="20" Width="200"
IsSnapToTickEnabled="True" Value="10" TickFrequency="1"
TickPlacement="None"
ValueChanged="RandWindowOnceMaxStudentsSlider_ValueChanged" />
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
@@ -109,19 +117,27 @@
Toggled="ToggleSwitchEnableMLAvoidance_Toggled"/> Toggled="ToggleSwitchEnableMLAvoidance_Toggled"/>
<ui:SettingsCard Header="{i18n:I18n Key=Random_ML_HistoryCount}"> <ui:SettingsCard Header="{i18n:I18n Key=Random_ML_HistoryCount}">
<Slider x:Name="MLAvoidanceHistorySlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="5" Maximum="50" Width="200" <TextBlock Text="{Binding ElementName=MLAvoidanceHistorySlider, Path=Value}"
IsSnapToTickEnabled="True" Value="50" TickFrequency="5" VerticalAlignment="Center" FontFamily="Consolas"/>
TickPlacement="None" <Slider x:Name="MLAvoidanceHistorySlider"
ValueChanged="MLAvoidanceHistorySlider_ValueChanged" /> Minimum="5" Maximum="50" Width="200"
IsSnapToTickEnabled="True" Value="50" TickFrequency="5"
TickPlacement="None"
ValueChanged="MLAvoidanceHistorySlider_ValueChanged" />
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_ML_Weight}"> <ui:SettingsCard Header="{i18n:I18n Key=Random_ML_Weight}">
<Slider x:Name="MLAvoidanceWeightSlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="0.1" Maximum="1.0" Width="200" <TextBlock Text="{Binding ElementName=MLAvoidanceWeightSlider, Path=Value, StringFormat={}{0:F1}}"
IsSnapToTickEnabled="True" Value="1.0" TickFrequency="0.1" VerticalAlignment="Center" FontFamily="Consolas"/>
TickPlacement="None" <Slider x:Name="MLAvoidanceWeightSlider"
ValueChanged="MLAvoidanceWeightSlider_ValueChanged" /> Minimum="0.1" Maximum="1.0" Width="200"
IsSnapToTickEnabled="True" Value="1.0" TickFrequency="0.1"
TickPlacement="None"
ValueChanged="MLAvoidanceWeightSlider_ValueChanged" />
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<TextBlock Text="{i18n:I18n Key=Random_ML_Hint}" <TextBlock Text="{i18n:I18n Key=Random_ML_Hint}"
@@ -152,11 +168,15 @@
Toggled="ToggleSwitchEnableOvertimeRedText_Toggled"/> Toggled="ToggleSwitchEnableOvertimeRedText_Toggled"/>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_Volume}"> <ui:SettingsCard Header="{i18n:I18n Key=Timer_Volume}">
<Slider x:Name="TimerVolumeSlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="0" Maximum="1" Width="200" <TextBlock Text="{Binding ElementName=TimerVolumeSlider, Path=Value, StringFormat={}{0:F1}}"
IsSnapToTickEnabled="True" Value="1" TickFrequency="0.1" VerticalAlignment="Center" FontFamily="Consolas"/>
TickPlacement="None" <Slider x:Name="TimerVolumeSlider"
ValueChanged="TimerVolumeSlider_ValueChanged" /> Minimum="0" Maximum="1" Width="200"
IsSnapToTickEnabled="True" Value="1" TickFrequency="0.1"
TickPlacement="None"
ValueChanged="TimerVolumeSlider_ValueChanged" />
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_CustomSoundLabel}"> <ui:SettingsCard Header="{i18n:I18n Key=Timer_CustomSoundLabel}">
@@ -172,11 +192,15 @@
Toggled="ToggleSwitchEnableProgressiveReminder_Toggled"/> Toggled="ToggleSwitchEnableProgressiveReminder_Toggled"/>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveVolume}"> <ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveVolume}">
<Slider x:Name="ProgressiveReminderVolumeSlider" <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
Minimum="0" Maximum="1" Width="200" <TextBlock Text="{Binding ElementName=ProgressiveReminderVolumeSlider, Path=Value, StringFormat={}{0:F1}}"
IsSnapToTickEnabled="True" Value="1" TickFrequency="0.1" VerticalAlignment="Center" FontFamily="Consolas"/>
TickPlacement="None" <Slider x:Name="ProgressiveReminderVolumeSlider"
ValueChanged="ProgressiveReminderVolumeSlider_ValueChanged" /> Minimum="0" Maximum="1" Width="200"
IsSnapToTickEnabled="True" Value="1" TickFrequency="0.1"
TickPlacement="None"
ValueChanged="ProgressiveReminderVolumeSlider_ValueChanged" />
</ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveCustomLabel}"> <ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveCustomLabel}">