Skip to content

Commit 2c6e154

Browse files
committed
twaeing the inner text view margin. more tweaks may follow. Who knows? :)
1 parent 1390b36 commit 2c6e154

7 files changed

+14
-10
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
186186
<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
187187
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
188-
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 1 0" />
188+
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 0 0" />
189189
<Setter Property="Template">
190190
<Setter.Value>
191191
<ControlTemplate TargetType="{x:Type TextBox}">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.ComboBox.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
218218
<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
219219
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
220-
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 1 0" />
220+
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="0 0 0 0" />
221221
<Setter Property="Template">
222222
<Setter.Value>
223223
<ControlTemplate TargetType="{x:Type TextBox}">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<Style x:Key="MaterialDesignDatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
1414
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
15-
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 0 0" />
15+
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="0 0 0 0" />
1616
<Setter Property="Background" Value="Transparent"/>
1717
<Setter Property="CaretBrush" Value="{Binding RelativeSource={RelativeSource Self}, Path=BorderBrush}"/>
1818
<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}" />
1414
<Setter Property="PasswordChar" Value=""/>
1515
<Setter Property="BorderThickness" Value="0 0 0 1"/>
16-
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 1 0" />
16+
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 0 0" />
1717
<Setter Property="Background" Value="Transparent"/>
1818
<Setter Property="CaretBrush" Value="{Binding RelativeSource={RelativeSource Self}, Path=BorderBrush}"/>
1919
<Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
1414
<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}" />
1515
<Setter Property="BorderThickness" Value="0 0 0 1"/>
16-
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 1 0" />
16+
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="0 0 0 0" />
1717
<Setter Property="Background" Value="Transparent"/>
1818
<Setter Property="CaretBrush" Value="{Binding RelativeSource={RelativeSource Self}, Path=BorderBrush}"/>
1919
<Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<ColumnDefinition Width="Auto" />
9898
</Grid.ColumnDefinitions>
9999
<TextBox BorderThickness="0" x:Name="PART_TextBox"
100-
wpf:TextFieldAssist.TextBoxViewMargin="1 0 0 0"
100+
wpf:TextFieldAssist.TextBoxViewMargin=".5 0 0 0"
101101
Margin="0"
102102
Template="{StaticResource TextBoxTemplate}"
103103
/>

MaterialDesignThemes.Wpf/Transitions/Transitioner.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,25 +108,29 @@ private void IsTransitionFinishedHandler(object sender, RoutedEventArgs routedEv
108108

109109
private void MoveNextHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)
110110
{
111-
_nextTransitionOrigin = GetNavigationSourcePoint(executedRoutedEventArgs);
111+
if (AutoApplyTransitionOrigins)
112+
_nextTransitionOrigin = GetNavigationSourcePoint(executedRoutedEventArgs);
112113
SetCurrentValue(SelectedIndexProperty, Math.Min(Items.Count - 1, SelectedIndex + 1));
113114
}
114115

115116
private void MovePreviousHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)
116117
{
117-
_nextTransitionOrigin = GetNavigationSourcePoint(executedRoutedEventArgs);
118+
if (AutoApplyTransitionOrigins)
119+
_nextTransitionOrigin = GetNavigationSourcePoint(executedRoutedEventArgs);
118120
SetCurrentValue(SelectedIndexProperty, Math.Max(0, SelectedIndex - 1));
119121
}
120122

121123
private void MoveFirstHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)
122124
{
123-
_nextTransitionOrigin = GetNavigationSourcePoint(executedRoutedEventArgs);
125+
if (AutoApplyTransitionOrigins)
126+
_nextTransitionOrigin = GetNavigationSourcePoint(executedRoutedEventArgs);
124127
SetCurrentValue(SelectedIndexProperty, 0);
125128
}
126129

127130
private void MoveLastHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)
128131
{
129-
_nextTransitionOrigin = GetNavigationSourcePoint(executedRoutedEventArgs);
132+
if (AutoApplyTransitionOrigins)
133+
_nextTransitionOrigin = GetNavigationSourcePoint(executedRoutedEventArgs);
130134
SetCurrentValue(SelectedIndexProperty, Items.Count - 1);
131135
}
132136

0 commit comments

Comments
 (0)