Skip to content

Commit

Permalink
Revert "Fix #1: FormatString not working with custom texts, Fix #2: C…
Browse files Browse the repository at this point in the history 
…ontrol not scaling correctly with HorizontalAlignment set to "Stretch""
  • Loading branch information
@Dirkster99
Dirkster99 committed Oct 20, 2022
1 parent ce21a9e commit b201cdf
Show file tree
Hide file tree
Showing 27 changed files with 357 additions and 289 deletions.
2 changes: 0 additions & 2 deletions source/Demo/UpDownDemoLib/ViewModels/DoubleUpDownViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ public class DoubleUpDownViewModel : BaseUpDownViewModel<double>
base.MaximumValue = maximumValue;
base.StepSize = stepSize;
base.LargeStepSize = largestepSize;

FormatString = "F4";
}

/// Method determine whether two objects of type {T} are equal.
Expand Down
2 changes: 0 additions & 2 deletions source/Demo/UpDownDemoLib/ViewModels/FloatUpDownViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ float largeStepSize
base.MaximumValue = maximumValue;
base.StepSize = stepSize;
base.LargeStepSize = largeStepSize;

FormatString = "F4";
}

/// Method determine whether two objects of type {T} are equal.
Expand Down
27 changes: 7 additions & 20 deletions source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="5" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
Expand All @@ -28,7 +27,7 @@
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3"
HorizontalAlignment="Stretch"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="{Binding HzntalContentAlignment}"
DisplayLength="5"
Expand All @@ -44,9 +43,10 @@
ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />

<Grid Grid.Column="2" Margin="12,3,3,3">
<Grid
Grid.Row="1"
Grid.Column="1"
Margin="12,3,3,3">
<Grid.Resources>
<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</Grid.Resources>
Expand Down Expand Up @@ -259,20 +259,7 @@
IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
</StackPanel>
</Border>

<Border
Margin="0,3"
BorderBrush="Gray"
BorderThickness="1">
<StackPanel Margin="3">

<Label Content="FormatString" />
<TextBox Text="{Binding FormatString}" />

</StackPanel>

</Border>
</StackPanel>
</StackPanel>
</GroupBox>
</Grid>
</Grid>
Expand Down
28 changes: 7 additions & 21 deletions source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="5" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
Expand All @@ -28,11 +27,10 @@
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3"
HorizontalAlignment="Stretch"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="{Binding HzntalContentAlignment}"
DisplayLength="10"
FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
IsDisplayLengthFixed="True"
IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
IsReadOnly="False"
Expand All @@ -44,9 +42,10 @@
ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />

<Grid Grid.Column="2" Margin="12,3,3,3">
<Grid
Grid.Row="1"
Grid.Column="1"
Margin="12,3,3,3">
<Grid.Resources>
<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</Grid.Resources>
Expand Down Expand Up @@ -251,20 +250,7 @@
IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
</StackPanel>
</Border>

<Border
Margin="0,3"
BorderBrush="Gray"
BorderThickness="1">
<StackPanel Margin="3">

<Label Content="FormatString" />
<TextBox Text="{Binding FormatString}" />

</StackPanel>

</Border>
</StackPanel>
</StackPanel>
</GroupBox>
</Grid>
</Grid>
Expand Down
28 changes: 8 additions & 20 deletions source/Demo/UpDownDemoLib/Views/DoubleUpDownDemo.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="5" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
Expand All @@ -28,11 +27,11 @@
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3"
HorizontalAlignment="Stretch"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="{Binding HzntalContentAlignment}"
DisplayLength="7"
FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
FormatString="F4"
IsDisplayLengthFixed="True"
IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
IsReadOnly="False"
Expand All @@ -44,9 +43,10 @@
ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />

<Grid Grid.Column="2" Margin="12,3,3,3">
<Grid
Grid.Row="1"
Grid.Column="1"
Margin="12,3,3,3">
<Grid.Resources>
<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</Grid.Resources>
Expand Down Expand Up @@ -248,19 +248,7 @@
IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
</StackPanel>
</Border>
<Border
Margin="0,3"
BorderBrush="Gray"
BorderThickness="1">
<StackPanel Margin="3">

<Label Content="FormatString" />
<TextBox Text="{Binding FormatString}" />

</StackPanel>

</Border>
</StackPanel>
</StackPanel>
</GroupBox>
</Grid>
</Grid>
Expand Down
27 changes: 7 additions & 20 deletions source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="5" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
Expand All @@ -28,11 +27,10 @@
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3"
HorizontalAlignment="Stretch"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="{Binding HzntalContentAlignment}"
DisplayLength="5"
FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
IsDisplayLengthFixed="True"
IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
IsReadOnly="False"
Expand All @@ -44,9 +42,10 @@
ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />

<Grid Grid.Column="2" Margin="12,3,3,3">
<Grid
Grid.Row="1"
Grid.Column="1"
Margin="12,3,3,3">
<Grid.Resources>
<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</Grid.Resources>
Expand Down Expand Up @@ -251,19 +250,7 @@
IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
</StackPanel>
</Border>
<Border
Margin="0,3"
BorderBrush="Gray"
BorderThickness="1">
<StackPanel Margin="3">

<Label Content="FormatString" />
<TextBox Text="{Binding FormatString}" />

</StackPanel>

</Border>
</StackPanel>
</StackPanel>
</GroupBox>
</Grid>
</Grid>
Expand Down
50 changes: 19 additions & 31 deletions source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="5" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
Expand All @@ -28,8 +27,8 @@
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="{Binding HzntalContentAlignment}"
DisplayLength="5"
FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Expand All @@ -45,9 +44,10 @@
ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />

<Grid Grid.Column="2" Margin="12,3,3,3">
<Grid
Grid.Row="1"
Grid.Column="1"
Margin="12,3,3,3">
<Grid.Resources>
<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</Grid.Resources>
Expand Down Expand Up @@ -230,47 +230,35 @@
ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
</StackPanel>

<Border
<Border
Margin="0,3"
BorderBrush="Gray"
BorderThickness="1">
<StackPanel xmlns:input="System.Windows.Input" Margin="3">
<StackPanel.Resources>
<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
</StackPanel.Resources>
<StackPanel xmlns:input="System.Windows.Input" Margin="3">
<StackPanel.Resources>
<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
</StackPanel.Resources>


<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />

<RadioButton
<RadioButton
Margin="3"
Content="Alt"
IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />

<RadioButton
<RadioButton
Margin="3"
Content="Control"
IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />

<RadioButton
<RadioButton
Margin="3"
Content="Shift"
IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
</StackPanel>
</Border>
<Border
Margin="0,3"
BorderBrush="Gray"
BorderThickness="1">
<StackPanel Margin="3">

<Label Content="FormatString" />
<TextBox Text="{Binding FormatString}" />

</StackPanel>

</Border>
</StackPanel>
</StackPanel>
</Border>
</StackPanel>
</GroupBox>
</Grid>
</Grid>
Expand Down
28 changes: 7 additions & 21 deletions source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="5" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
Expand All @@ -28,7 +27,7 @@
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3"
HorizontalAlignment="Stretch"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="{Binding HzntalContentAlignment}"
DisplayLength="5"
Expand All @@ -45,9 +44,10 @@
ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />

<Grid Grid.Column="2" Margin="12,3,3,3">
<Grid
Grid.Row="1"
Grid.Column="1"
Margin="12,3,3,3">
<Grid.Resources>
<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</Grid.Resources>
Expand Down Expand Up @@ -258,21 +258,7 @@
IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
</StackPanel>
</Border>

<Border
Margin="0,3"
BorderBrush="Gray"
BorderThickness="1">
<StackPanel Margin="3">

<Label Content="FormatString" />
<TextBox Text="{Binding FormatString}" />

</StackPanel>

</Border>

</StackPanel>
</StackPanel>
</GroupBox>
</Grid>
</Grid>
Expand Down
Loading

0 comments on commit b201cdf

Please sign in to comment.