Merge pull request lepoco#659 from IvanDmitriev1/fixes

Textbox control update, small other changes.

Author: pomianowski

src/Wpf.Ui.Gallery/Views/Pages/Layout/ExpanderPage.xaml

@@ -21,41 +21,40 @@
         <system:String x:Key="PageCsharpUrl">https://github.com/lepoco/wpfui/blob/development/src/Wpf.Ui/Controls/Expander.cs</system:String>
     </Page.Resources>
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;Expander Header=&quot;This text is in the header&quot; Content=&quot;This is in the content&quot; /&gt;"
-                        HeaderText="An Expander with text in the header and content areas">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Expander
-                                Grid.Column="0"
-                                Content="This is in the content"
-                                Header="This text is in the header" />
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                            <!--  TODO: ExpandDirection  -->
-                        </Grid>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;Expander Header=&quot;This text is in the header&quot; Content=&quot;This is in the content&quot; /&gt;"
+                HeaderText="An Expander with text in the header and content areas">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Expander
+                        Grid.Column="0"
+                        Content="This is in the content"
+                        Header="This text is in the header" />
+
+                    <!--  TODO: ExpandDirection  -->
                 </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>

src/Wpf.Ui.Gallery/Views/Pages/Samples/MultilevelNavigationSamplePage3.xaml

@@ -33,7 +33,7 @@
             HorizontalAlignment="Center"
             Command="{Binding NavigateForwardCommand}"
             CommandParameter="{x:Type local:MultilevelNavigationSamplePage1}"
-            Content="Navigate to the third page"
+            Content="Navigate to the first page"
             FontSize="24" />
     </Grid>
 </Page>

src/Wpf.Ui/Controls/TextBox.cs

@@ -35,22 +35,6 @@ public class TextBox : System.Windows.Controls.TextBox
         typeof(ElementPlacement), typeof(TextBox),
         new PropertyMetadata(ElementPlacement.Left));
 
-    /// <summary>
-    /// Property for <see cref="TextBoxClearButtonIconSize"/>.
-    /// </summary>
-    public static readonly DependencyProperty TextBoxClearButtonIconSizeProperty = DependencyProperty.Register(
-        nameof(TextBoxClearButtonIconSize),
-        typeof(int), typeof(TextBox),
-        new FrameworkPropertyMetadata());
-
-    /// <summary>
-    /// Property for <see cref="TextBoxClearButtonHeight"/>.
-    /// </summary>
-    public static readonly DependencyProperty TextBoxClearButtonHeightProperty = DependencyProperty.Register(
-        nameof(TextBoxClearButtonHeight),
-        typeof(int), typeof(TextBox),
-        new FrameworkPropertyMetadata());
-
     /// <summary>
     /// Property for <see cref="PlaceholderText"/>.
     /// </summary>
@@ -137,22 +121,7 @@ public bool ClearButtonEnabled
         get => (bool)GetValue(ClearButtonEnabledProperty);
         set => SetValue(ClearButtonEnabledProperty, value);
     }
-    /// <summary>
-    /// Defines size of TextBoxClearButton should be.
-    /// </summary>
-    public int TextBoxClearButtonIconSize
-    {
-        get => (int)GetValue(TextBoxClearButtonIconSizeProperty);
-        set => SetValue(TextBoxClearButtonIconSizeProperty, value);
-    }
-    /// <summary>
-    /// Defines height of TextBoxClearButton should be.
-    /// </summary>
-    public int TextBoxClearButtonHeight
-    {
-        get => (int)GetValue(TextBoxClearButtonHeightProperty);
-        set => SetValue(TextBoxClearButtonHeightProperty, value);
-    }
+    
     /// <summary>
     /// Gets or sets a value determining whether to show the clear button when <see cref="TextBox"/> is focused.
     /// </summary>

src/Wpf.Ui/Styles/Controls/Button.xaml

@@ -205,7 +205,7 @@
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding Icon}"
                                     Focusable="False"
-                                    TextElement.FontSize="{Binding Path=FontSize,RelativeSource={RelativeSource TemplatedParent}}"
+                                    TextElement.FontSize="{TemplateBinding FontSize}"
                                     TextElement.Foreground="{TemplateBinding Foreground}" />
 
                                 <ContentPresenter

src/Wpf.Ui/Styles/Controls/FluentWindow.xaml

@@ -52,14 +52,6 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Style.Triggers>
-            <Trigger Property="WindowState" Value="Normal">
-                <Setter Property="ResizeMode" Value="CanResize" />
-            </Trigger>
-            <Trigger Property="WindowState" Value="Maximized">
-                <Setter Property="ResizeMode" Value="NoResize" />
-            </Trigger>
-        </Style.Triggers>
     </Style>
 
     <Style BasedOn="{StaticResource DefaultFluentWindowStyle}" TargetType="{x:Type windowControls:FluentWindow}" />