commit 52474c8915dc368afb8bfea6007a11ef0ad5c1e9
parent 0f0926eee21e2cd80e1b10b5d5dac1f96c46f496
Author: Minerva_juppiter <ryouturn@gmail.com>
Date: Mon, 1 Apr 2024 19:52:50 +0900
スライダーを整数値のみに修正
Diffstat:
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -26,17 +26,17 @@
<CheckBox x:Name="Diskcheck" Content="Disk" HorizontalAlignment="Center" Grid.Row="2" VerticalAlignment="Center" d:LayoutOverrides="LeftPosition, RightPosition"/>
<Button x:Name="SaveSettingButton" Content="Save" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Center" d:LayoutOverrides="Width" Click="SaveSettingButton_Click"/>
- <Slider x:Name="CPUSlider" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150" ValueChanged="CPUSlider_ValueChanged" Maximum="100" SmallChange="1"/>
+ <Slider x:Name="CPUSlider" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150" ValueChanged="CPUSlider_ValueChanged" Maximum="100" LargeChange="10" SmallChange="1"/>
<TextBox x:Name="TextBox_CPUSlider" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Right" TextChanged="TextBox_CPUSlider_TextChanged" VerticalAlignment="Center" Text="0" MaxLines="4" MaxLength="3" Margin="0,0,5,0"/>
<TextBlock x:Name="sec_CPU" Grid.Column="2" TextWrapping="Wrap" Text="sec." IsEnabled="False" IsHitTestVisible="False" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,50,0"/>
<TextBox x:Name="CPUSecTextBox" Grid.Column="2" TextWrapping="Wrap" VerticalAlignment="Center" d:LayoutOverrides="TopPosition, BottomPosition" Text="10" UndoLimit="4" HorizontalAlignment="Center" TextAlignment="Center" TextChanged="CPUSecTextBox_TextChanged" MaxLines="1" MaxLength="3"/>
- <Slider x:Name="MemorySlider" Grid.Column="1" HorizontalAlignment="Center" Width="150" Grid.Row="1" d:LayoutOverrides="Height" ValueChanged="MemorySlider_ValueChanged" Maximum="100" VerticalAlignment="Center" SmallChange="1"/>
+ <Slider x:Name="MemorySlider" Grid.Column="1" HorizontalAlignment="Center" Width="150" Grid.Row="1" d:LayoutOverrides="Height" ValueChanged="MemorySlider_ValueChanged" Maximum="100" VerticalAlignment="Center" LargeChange="10" SmallChange="1"/>
<TextBox x:Name="TextBox_MemorySlider" Grid.Column="1" TextChanged="TextBox_MemorySlider_TextChanged" Grid.Row="1" d:LayoutOverrides="Width, Height" Text="0" VerticalAlignment="Center" MaxLength="3" MaxLines="1" HorizontalAlignment="Right" Margin="0,0,5,0"/>
<TextBlock x:Name="sec_Memory" Grid.Column="2" TextWrapping="Wrap" Text="sec." IsEnabled="False" IsHitTestVisible="False" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,50,0"/>
<TextBox x:Name="MemorySecTextBox" Grid.Column="2" TextWrapping="Wrap" Text="10" UndoLimit="4" HorizontalAlignment="Center" TextAlignment="Center" d:LayoutOverrides="Height" Grid.Row="1" TextChanged="MemorySecTextBox_TextChanged" MaxLines="1" MaxLength="3" VerticalAlignment="Center"/>
- <Slider x:Name="DiskSlider" Grid.Column="1" HorizontalAlignment="Center" Width="150" Grid.Row="2" d:LayoutOverrides="Height" ValueChanged="DiskSlider_ValueChanged" Maximum="100" VerticalAlignment="Center" SmallChange="1"/>
+ <Slider x:Name="DiskSlider" Grid.Column="1" HorizontalAlignment="Center" Width="150" Grid.Row="2" d:LayoutOverrides="Height" ValueChanged="DiskSlider_ValueChanged" Maximum="100" VerticalAlignment="Center" LargeChange="10" SmallChange="1"/>
<TextBox x:Name="TextBox_DiskSlider" Grid.Column="1" HorizontalAlignment="Right" Grid.Row="2" TextWrapping="Wrap" Text="0" VerticalAlignment="Center" d:LayoutOverrides="TopPosition, BottomPosition" TextChanged="TextBox_DiskSlider_TextChanged" MaxLength="3" MaxLines="2" Margin="0,0,5,0"/>
<TextBlock x:Name="sec_Disk" Grid.Column="2" TextWrapping="Wrap" Text="sec." IsEnabled="False" IsHitTestVisible="False" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,50,0"/>
<TextBox x:Name="DiskSecTextBox" Grid.Column="2" TextWrapping="Wrap" Text="10" UndoLimit="4" HorizontalAlignment="Center" TextAlignment="Center" Grid.Row="2" d:LayoutOverrides="Height" TextChanged="DiskSecTextBox_TextChanged" MaxLength="3" MaxLines="1" VerticalAlignment="Center"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -96,18 +96,21 @@ namespace BusynessNotification
private void CPUSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
- SliderCPU = CPUSlider.Value;
+ SliderCPU = Math.Round(CPUSlider.Value);
+ CPUSlider.Value = SliderCPU;
TextBox_CPUSlider.Text = SliderCPU.ToString();
}
private void MemorySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
- SliderMemory = MemorySlider.Value;
+ SliderMemory = Math.Round(MemorySlider.Value);
+ MemorySlider.Value = SliderMemory;
TextBox_MemorySlider.Text = SliderMemory.ToString();
}
private void DiskSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
- SliderDisk = DiskSlider.Value;
+ SliderDisk = Math.Round(DiskSlider.Value);
+ DiskSlider.Value = SliderDisk;
TextBox_DiskSlider.Text = SliderDisk.ToString();
}