Merge branch 'net6' of https://github.com/InkCanvasForClass/community into net6

2026-05-01 00:50:23 +08:00
parent 003fffca2d 1cb77b4f48
commit 77a7628453
9 changed files with 178 additions and 138 deletions
@@ -51,12 +51,16 @@
                        <ui:SettingsExpander.HeaderIcon>
                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Touch}" />
                        </ui:SettingsExpander.HeaderIcon>
-                        <Slider x:Name="TouchMultiplierSlider"
-                                Minimum="0" Maximum="2"
-                                Width="200"
-                                IsSnapToTickEnabled="True"
-                                TickFrequency="0.01" TickPlacement="None"
-                                ValueChanged="TouchMultiplierSlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding Value, ElementName=TouchMultiplierSlider, StringFormat={}{0:F2}}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="TouchMultiplierSlider"
+                                    Minimum="0" Maximum="2"
+                                    Width="200"
+                                    IsSnapToTickEnabled="True"
+                                    TickFrequency="0.01" TickPlacement="None"
+                                    ValueChanged="TouchMultiplierSlider_ValueChanged" />
+                        </ikw:SimpleStackPanel>
                        <ui:SettingsExpander.Items>
                            <ui:SettingsCard Header="{i18n:I18n Key=Advanced_TouchMultiplierCalibrateHint}"
                                             ContentAlignment="Left">
@@ -81,19 +85,27 @@
                        Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled"/>

                    <ui:SettingsCard Header="{i18n:I18n Key=Advanced_NibModeBoundsWidthHeader}">
-                        <Slider x:Name="NibModeBoundsWidthSlider"
-                                Minimum="1" Maximum="50" Width="200"
-                                IsSnapToTickEnabled="True" TickFrequency="1" Value="5"
-                                TickPlacement="None"
-                                ValueChanged="NibModeBoundsWidthSlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding Value, ElementName=NibModeBoundsWidthSlider}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="NibModeBoundsWidthSlider"
+                                    Minimum="1" Maximum="50" Width="200"
+                                    IsSnapToTickEnabled="True" TickFrequency="1" Value="5"
+                                    TickPlacement="None"
+                                    ValueChanged="NibModeBoundsWidthSlider_ValueChanged" />
+                        </ikw:SimpleStackPanel>
                    </ui:SettingsCard>

                    <ui:SettingsCard Header="{i18n:I18n Key=Advanced_FingerModeBoundsWidthHeader}">
-                        <Slider x:Name="FingerModeBoundsWidthSlider"
-                                Minimum="1" Maximum="50" Width="200"
-                                IsSnapToTickEnabled="True" TickFrequency="1" Value="20"
-                                TickPlacement="None"
-                                ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding Value, ElementName=FingerModeBoundsWidthSlider}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="FingerModeBoundsWidthSlider"
+                                    Minimum="1" Maximum="50" Width="200"
+                                    IsSnapToTickEnabled="True" TickFrequency="1" Value="20"
+                                    TickPlacement="None"
+                                    ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" />
+                        </ikw:SimpleStackPanel>
                    </ui:SettingsCard>

                    <controls:LabeledSettingsCard x:Name="ToggleSwitchIsQuadIR"
@@ -125,7 +125,7 @@
                            <TextBlock Text="{Binding ElementName=ViewboxFloatingBarScaleTransformValueSlider, Path=Value, StringFormat={}{0:F2}}"
                                       VerticalAlignment="Center" FontFamily="Consolas"/>
                            <Slider x:Name="ViewboxFloatingBarScaleTransformValueSlider" Minimum="0.5"
-                                    Maximum="1.25" Width="168"
+                                    Maximum="1.25" Width="200"
                                    IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
                                    TickPlacement="None" AutoToolTipPlacement="None"
                                    ValueChanged="ViewboxFloatingBarScaleTransformValueSlider_ValueChanged" />
@@ -140,7 +140,7 @@
                            <TextBlock Text="{Binding ElementName=ViewboxFloatingBarOpacityValueSlider, Path=Value, StringFormat={}{0:F2}}"
                                       VerticalAlignment="Center" FontFamily="Consolas"/>
                            <Slider x:Name="ViewboxFloatingBarOpacityValueSlider" Minimum="0.3"
-                                    Maximum="1" Width="168"
+                                    Maximum="1" Width="200"
                                    IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
                                    TickPlacement="None" AutoToolTipPlacement="None"
                                    ValueChanged="ViewboxFloatingBarOpacityValueSlider_ValueChanged" />
@@ -153,13 +153,13 @@
                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Play}" />
                        </ui:SettingsCard.HeaderIcon>
                        <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"
-                                    Maximum="1" Width="168"
+                                    Maximum="1" Width="200"
                                    IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
                                    TickPlacement="None" AutoToolTipPlacement="None"
                                    ValueChanged="ViewboxFloatingBarOpacityInPPTValueSlider_ValueChanged" />
-                            <TextBlock Text="{Binding ElementName=ViewboxFloatingBarOpacityInPPTValueSlider, Path=Value}"
-                                       VerticalAlignment="Center" FontFamily="Consolas" Width="40" />
                        </ikw:SimpleStackPanel>
                    </ui:SettingsCard>

@@ -177,7 +177,7 @@
                            <TextBlock Text="{Binding ElementName=ViewboxBlackBoardScaleTransformValueSlider, Path=Value, StringFormat={}{0:F2}}"
                                       VerticalAlignment="Center" FontFamily="Consolas"/>
                            <Slider x:Name="ViewboxBlackBoardScaleTransformValueSlider" Minimum="0.5"
-                                    Maximum="1.5" Width="168"
+                                    Maximum="1.5" Width="200"
                                    IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
                                    TickPlacement="None" AutoToolTipPlacement="None"
                                    ValueChanged="ViewboxBlackBoardScaleTransformValueSlider_ValueChanged" />
@@ -146,12 +146,12 @@
                                Toggled="ToggleSwitchEnableInkFade_Toggled" />
                        <ui:SettingsExpander.Items>
                            <ui:SettingsCard Header="{i18n:I18n Key=Canvas_InkFadeTime}">
-                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12">
-                                    <Slider x:Name="InkFadeTimeSlider" Width="150" Minimum="1000" Maximum="10000"
+                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                                    <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"
                                            ValueChanged="InkFadeTimeSlider_ValueChanged" />
-                                    <TextBlock Text="{Binding Value, ElementName=InkFadeTimeSlider, StringFormat={}{0:0}ms}"
-                                               VerticalAlignment="Center" FontSize="14" />
                                </ikw:SimpleStackPanel>
                            </ui:SettingsCard>
                        </ui:SettingsExpander.Items>
@@ -195,21 +195,21 @@
                                </ComboBox>
                            </ui:SettingsCard>
                            <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"
                                            TickFrequency="1" IsSnapToTickEnabled="True" Value="5"
                                            ValueChanged="BrushAutoRestoreWidthSlider_ValueChanged" />
-                                    <TextBlock Text="{Binding Value, ElementName=BrushAutoRestoreWidthSlider, StringFormat={}{0:0}px}"
-                                               FontSize="12" VerticalAlignment="Center" />
                                </ikw:SimpleStackPanel>
                            </ui:SettingsCard>
                            <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"
                                            TickFrequency="5" IsSnapToTickEnabled="True"
                                            ValueChanged="BrushAutoRestoreAlphaSlider_ValueChanged" />
-                                    <TextBlock Text="{Binding Value, ElementName=BrushAutoRestoreAlphaSlider, StringFormat={}{0:0}}"
-                                               FontSize="12" VerticalAlignment="Center" />
                                </ikw:SimpleStackPanel>
                            </ui:SettingsCard>
                        </ui:SettingsExpander.Items>
@@ -229,12 +229,12 @@
                        <ui:SettingsExpander.Items>
                            <ui:SettingsCard Header="{i18n:I18n Key=Canvas_SwitchBackDelay}"
                                    Description="{i18n:I18n Key=Canvas_SwitchBackDelayHint}">
-                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12">
-                                    <Slider x:Name="EraserAutoSwitchBackDelaySlider" Width="150" Minimum="1" Maximum="60"
+                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                                    <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"
                                            ValueChanged="EraserAutoSwitchBackDelaySlider_ValueChanged" />
-                                    <TextBlock Text="{Binding Value, ElementName=EraserAutoSwitchBackDelaySlider, StringFormat={}{0:0}秒}"
-                                               VerticalAlignment="Center" FontSize="14" />
                                </ikw:SimpleStackPanel>
                            </ui:SettingsCard>
                        </ui:SettingsExpander.Items>
@@ -33,10 +33,33 @@

                <controls:LabeledSettingsCard x:Name="ToggleSwitchDebugConsole"
                    Header="显示调试窗口"
-                    Description="显示一个独立的控制台窗口，用于实时输出日志（开启后立即生效；关闭设置中的“启用日志记录”将不会输出内容）。"
+                    Description="显示一个独立的控制台窗口，用于实时输出日志（开启后立即生效；关闭设置中的"启用日志记录"将不会输出内容）。"
                    Icon="{x:Static ui:SegoeFluentIcons.DeveloperTools}"
                    IsOn="False"
                    Toggled="ToggleSwitchDebugConsole_Toggled"/>
+
+                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
+                    Text="图标设置" />
+
+                <ui:SettingsExpander Header="SettingsExpander 示例" IsEnabled="True"
+                    IsExpanded="True"
+                    d:Visibility="Visible" d:IsExpanded="True">
+
+                    <ui:SettingsExpander.HeaderIcon>
+                        <ui:FontIcon Glyph="&#xE91B;"/>
+                    </ui:SettingsExpander.HeaderIcon>
+
+                    <controls:CopyButton Text="You can override the Left indention of a SettingsCard by overriding the SettingsCardLeftIndention"/>
+
+                    <ui:SettingsExpander.Items>
+                        <ui:SettingsCard Description="You can override the Left indention of a SettingsCard by overriding the SettingsCardLeftIndention"
+                            Header="Customization">
+                            <ui:SettingsCard.Resources>
+                                <sys:Double x:Key="SettingsCardLeftIndention">0</sys:Double>
+                            </ui:SettingsCard.Resources>
+                        </ui:SettingsCard>
+                    </ui:SettingsExpander.Items>
+                </ui:SettingsExpander>
            </ikw:SimpleStackPanel>
        </Grid>
    </ScrollViewer>
@@ -1,41 +0,0 @@
-<ui:Page
-    x:Class="Ink_Canvas.Windows.SettingsViews.Pages.IconographyPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls"
-    Title="图标设置"
-    mc:Ignorable="d">
-    <Grid x:Name="RootGrid">
-        <StackPanel Margin="24">
-            <ui:SettingsExpander x:Name="settingsCard" VerticalAlignment="Top"
-        Description="The SettingsExpander has the same properties as a Card, and you can set SettingsCard as part of the Items collection."
-        Header="SettingsExpander" IsEnabled="True"
-        IsExpanded="True"
-        d:Visibility="Visible" d:IsExpanded="True">
-
-                <ui:SettingsExpander.HeaderIcon>
-                    <ui:FontIcon Glyph="&#xE91B;"/>
-                </ui:SettingsExpander.HeaderIcon>
-
-
-                <controls:CopyButton Text="You can override the Left indention of a SettingsCard by overriding the SettingsCardLeftIndention"/>
-
-
-
-                <ui:SettingsExpander.Items>
-                    <ui:SettingsCard Description="You can override the Left indention of a SettingsCard by overriding the SettingsCardLeftIndention"
-            Header="Customization">
-                        <ui:SettingsCard.Resources>
-                            <sys:Double x:Key="SettingsCardLeftIndention">0</sys:Double>
-                        </ui:SettingsCard.Resources>
-                    </ui:SettingsCard>
-                </ui:SettingsExpander.Items>
-            </ui:SettingsExpander>
-        </StackPanel>
-    </Grid>
-</ui:Page>
@@ -1,10 +0,0 @@
-namespace Ink_Canvas.Windows.SettingsViews.Pages
-{
-    public partial class IconographyPage : iNKORE.UI.WPF.Modern.Controls.Page
-    {
-        public IconographyPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
@@ -112,21 +112,21 @@
                                Toggled="ToggleSwitchAutoStraightenLine_Toggled" />
                        <ui:SettingsExpander.Items>
                            <ui:SettingsCard Header="{i18n:I18n Key=InkRecog_LengthThreshold}">
-                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12">
-                                    <Slider x:Name="AutoStraightenLineThresholdSlider" Width="150" Minimum="30" Maximum="300"
+                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                                    <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"
                                            ValueChanged="AutoStraightenLineThresholdSlider_ValueChanged" />
-                                    <TextBlock Text="{Binding Value, ElementName=AutoStraightenLineThresholdSlider, StringFormat={}{0:0}}"
-                                               VerticalAlignment="Center" FontSize="14" />
                                </ikw:SimpleStackPanel>
                            </ui:SettingsCard>
                            <ui:SettingsCard Header="{i18n:I18n Key=InkRecog_Sensitivity}">
-                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12">
-                                    <Slider x:Name="LineStraightenSensitivitySlider" Width="150" Minimum="0.05" Maximum="2.0"
+                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                                    <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"
                                            ValueChanged="LineStraightenSensitivitySlider_ValueChanged" />
-                                    <TextBlock Text="{Binding Value, ElementName=LineStraightenSensitivitySlider, StringFormat={}{0:F2}}"
-                                               VerticalAlignment="Center" FontSize="14" />
                                </ikw:SimpleStackPanel>
                            </ui:SettingsCard>
                            <ui:SettingsCard Header="{i18n:I18n Key=InkRecog_HighPrecisionStraighten}"
@@ -152,12 +152,12 @@
                        <ui:SettingsExpander.Items>
                            <ui:SettingsCard Header="{i18n:I18n Key=InkRecog_SnappingDistance}"
                                    Description="{i18n:I18n Key=InkRecog_LineEndpointSnappingHint}">
-                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12">
-                                    <Slider x:Name="LineEndpointSnappingThresholdSlider" Width="150" Minimum="5" Maximum="50"
+                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                                    <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"
                                            ValueChanged="LineEndpointSnappingThresholdSlider_ValueChanged" />
-                                    <TextBlock Text="{Binding Value, ElementName=LineEndpointSnappingThresholdSlider, StringFormat={}{0:0}}"
-                                               VerticalAlignment="Center" FontSize="14" />
                                </ikw:SimpleStackPanel>
                            </ui:SettingsCard>
                        </ui:SettingsExpander.Items>
@@ -82,10 +82,18 @@
                        </ui:SettingsExpander.Content>
                        <ui:SettingsExpander.Items>
                            <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 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:SettingsExpander.Items>
                    </ui:SettingsExpander>
@@ -101,10 +109,18 @@
                        </ui:SettingsExpander.Content>
                        <ui:SettingsExpander.Items>
                            <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 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:SettingsExpander.Items>
                    </ui:SettingsExpander>
@@ -120,10 +136,18 @@
                        </ui:SettingsExpander.Content>
                        <ui:SettingsExpander.Items>
                            <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 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:SettingsExpander.Items>
                    </ui:SettingsExpander>
@@ -139,10 +163,18 @@
                        </ui:SettingsExpander.Content>
                        <ui:SettingsExpander.Items>
                            <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 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:SettingsExpander.Items>
                    </ui:SettingsExpander>
@@ -64,19 +64,27 @@
                    </ui:SettingsCard>

                    <ui:SettingsCard Header="{i18n:I18n Key=Random_OnceCloseDelay}">
-                        <Slider x:Name="RandWindowOnceCloseLatencySlider"
-                                Minimum="0.5" Maximum="8" Width="200"
-                                IsSnapToTickEnabled="True" Value="2.5"
-                                TickFrequency="0.1" TickPlacement="None"
-                                ValueChanged="RandWindowOnceCloseLatencySlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding ElementName=RandWindowOnceCloseLatencySlider, Path=Value, StringFormat={}{0:F1}}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="RandWindowOnceCloseLatencySlider"
+                                    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 Header="{i18n:I18n Key=Random_OnceMaxStudents}">
-                        <Slider x:Name="RandWindowOnceMaxStudentsSlider"
-                                Minimum="0" Maximum="20" Width="200"
-                                IsSnapToTickEnabled="True" Value="10" TickFrequency="1"
-                                TickPlacement="None"
-                                ValueChanged="RandWindowOnceMaxStudentsSlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding ElementName=RandWindowOnceMaxStudentsSlider, Path=Value}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="RandWindowOnceMaxStudentsSlider"
+                                    Minimum="0" Maximum="20" Width="200"
+                                    IsSnapToTickEnabled="True" Value="10" TickFrequency="1"
+                                    TickPlacement="None"
+                                    ValueChanged="RandWindowOnceMaxStudentsSlider_ValueChanged" />
+                        </ikw:SimpleStackPanel>
                    </ui:SettingsCard>

                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
@@ -109,19 +117,27 @@
                        Toggled="ToggleSwitchEnableMLAvoidance_Toggled"/>

                    <ui:SettingsCard Header="{i18n:I18n Key=Random_ML_HistoryCount}">
-                        <Slider x:Name="MLAvoidanceHistorySlider"
-                                Minimum="5" Maximum="50" Width="200"
-                                IsSnapToTickEnabled="True" Value="50" TickFrequency="5"
-                                TickPlacement="None"
-                                ValueChanged="MLAvoidanceHistorySlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding ElementName=MLAvoidanceHistorySlider, Path=Value}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="MLAvoidanceHistorySlider"
+                                    Minimum="5" Maximum="50" Width="200"
+                                    IsSnapToTickEnabled="True" Value="50" TickFrequency="5"
+                                    TickPlacement="None"
+                                    ValueChanged="MLAvoidanceHistorySlider_ValueChanged" />
+                        </ikw:SimpleStackPanel>
                    </ui:SettingsCard>

                    <ui:SettingsCard Header="{i18n:I18n Key=Random_ML_Weight}">
-                        <Slider x:Name="MLAvoidanceWeightSlider"
-                                Minimum="0.1" Maximum="1.0" Width="200"
-                                IsSnapToTickEnabled="True" Value="1.0" TickFrequency="0.1"
-                                TickPlacement="None"
-                                ValueChanged="MLAvoidanceWeightSlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding ElementName=MLAvoidanceWeightSlider, Path=Value, StringFormat={}{0:F1}}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="MLAvoidanceWeightSlider"
+                                    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>

                    <TextBlock Text="{i18n:I18n Key=Random_ML_Hint}"
@@ -152,11 +168,15 @@
                        Toggled="ToggleSwitchEnableOvertimeRedText_Toggled"/>

                    <ui:SettingsCard Header="{i18n:I18n Key=Timer_Volume}">
-                        <Slider x:Name="TimerVolumeSlider"
-                                Minimum="0" Maximum="1" Width="200"
-                                IsSnapToTickEnabled="True" Value="1" TickFrequency="0.1"
-                                TickPlacement="None"
-                                ValueChanged="TimerVolumeSlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding ElementName=TimerVolumeSlider, Path=Value, StringFormat={}{0:F1}}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="TimerVolumeSlider"
+                                    Minimum="0" Maximum="1" Width="200"
+                                    IsSnapToTickEnabled="True" Value="1" TickFrequency="0.1"
+                                    TickPlacement="None"
+                                    ValueChanged="TimerVolumeSlider_ValueChanged" />
+                        </ikw:SimpleStackPanel>
                    </ui:SettingsCard>

                    <ui:SettingsCard Header="{i18n:I18n Key=Timer_CustomSoundLabel}">
@@ -172,11 +192,15 @@
                        Toggled="ToggleSwitchEnableProgressiveReminder_Toggled"/>

                    <ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveVolume}">
-                        <Slider x:Name="ProgressiveReminderVolumeSlider"
-                                Minimum="0" Maximum="1" Width="200"
-                                IsSnapToTickEnabled="True" Value="1" TickFrequency="0.1"
-                                TickPlacement="None"
-                                ValueChanged="ProgressiveReminderVolumeSlider_ValueChanged" />
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="{Binding ElementName=ProgressiveReminderVolumeSlider, Path=Value, StringFormat={}{0:F1}}"
+                                       VerticalAlignment="Center" FontFamily="Consolas"/>
+                            <Slider x:Name="ProgressiveReminderVolumeSlider"
+                                    Minimum="0" Maximum="1" Width="200"
+                                    IsSnapToTickEnabled="True" Value="1" TickFrequency="0.1"
+                                    TickPlacement="None"
+                                    ValueChanged="ProgressiveReminderVolumeSlider_ValueChanged" />
+                        </ikw:SimpleStackPanel>
                    </ui:SettingsCard>

                    <ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveCustomLabel}">