chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhance: optimized CoverView

Browse Source
This commit is contained in:
NaBian committed 2022-03-10 21:23:34 +08:00
1 parent 508dfc0cf8
commit 12a01ac78e
7 files changed
+20 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+2 -4
View File
@@ -7860,7 +7860,7 @@
<RowDefinition Height="16" />
<RowDefinition />
</Grid.RowDefinitions>
<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
<Border.RenderTransform>
<TransformGroup>
<TranslateTransform X="5" Y="5" />
@@ -7892,9 +7892,7 @@
<Setter.Value>
<ControlTemplate TargetType="hc:CoverView">
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
<ScrollViewer>
<WrapPanel x:Name="PART_Panel" />
</ScrollViewer>
<WrapPanel x:Name="PART_Panel" />
</Border>
</ControlTemplate>
</Setter.Value>
src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
+1 -1
View File
@@ -341,7 +341,7 @@ namespace HandyControl.Controls
"ShowSelectAllButton", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.TrueBox));
public static void SetShowSelectAllButton(DependencyObject element, bool value)
=> element.SetValue(ShowSelectAllButtonProperty, value);
=> element.SetValue(ShowSelectAllButtonProperty, ValueBoxes.BooleanBox(value));
public static bool GetShowSelectAllButton(DependencyObject element)
=> (bool) element.GetValue(ShowSelectAllButtonProperty);
src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace HandyControl.Controls
"AutoHide", typeof(bool), typeof(ScrollViewerAttach), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
public static void SetAutoHide(DependencyObject element, bool value)
=> element.SetValue(AutoHideProperty, value);
=> element.SetValue(AutoHideProperty, ValueBoxes.BooleanBox(value));
public static bool GetAutoHide(DependencyObject element)
=> (bool) element.GetValue(AutoHideProperty);
src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
+10 -4
View File
@@ -35,7 +35,7 @@ namespace HandyControl.Controls
{
if (_selectedItem == null)
{
item.IsSelected = true;
item.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.TrueBox);
_selectedItem = item;
if (_viewContent != null)
{
@@ -49,8 +49,8 @@ namespace HandyControl.Controls
if (!Equals(_selectedItem, item))
{
_selectedItem.IsSelected = false;
item.IsSelected = true;
_selectedItem.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.FalseBox);
item.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.TrueBox);
_selectedItem = item;
if (_viewContent != null)
{
@@ -67,7 +67,7 @@ namespace HandyControl.Controls
_viewContent.ContentTemplate = null;
UpdateCoverViewContent(false);
}
_selectedItem.IsSelected = false;
_selectedItem.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.FalseBox);
_selectedItem = null;
}
}
@@ -218,6 +218,12 @@ namespace HandyControl.Controls
{
ItemsHost.Children.Remove(_viewContent);
}
if (_selectedItem == null)
{
return;
}
var total = _entryDic.Count + 1;
var totalRow = total / Groups + (total % Groups > 0 ? 1 : 0);
if (total <= Groups)
src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace HandyControl.Controls
{
[TemplatePart(Name = ElementTriangle, Type = typeof(FrameworkElement))]
[TemplatePart(Name = ElementContent, Type = typeof(FrameworkElement))]
internal class CoverViewContent : ContentControl
public class CoverViewContent : ContentControl
{
private const string ElementTriangle = "PART_Triangle";
src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml
+3 -5
View File
@@ -29,7 +29,7 @@
<RowDefinition Height="16"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
<Border.RenderTransform>
<TransformGroup>
<TranslateTransform X="5" Y="5"/>
@@ -62,13 +62,11 @@
<Setter.Value>
<ControlTemplate TargetType="hc:CoverView">
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
<ScrollViewer>
<WrapPanel x:Name="PART_Panel"/>
</ScrollViewer>
<WrapPanel x:Name="PART_Panel"/>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</ResourceDictionary>
src/Shared/HandyControl_Shared/Themes/Theme.xaml
+2 -4
View File
@@ -7978,7 +7978,7 @@
<RowDefinition Height="16" />
<RowDefinition />
</Grid.RowDefinitions>
<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
<Border.RenderTransform>
<TransformGroup>
<TranslateTransform X="5" Y="5" />
@@ -8010,9 +8010,7 @@
<Setter.Value>
<ControlTemplate TargetType="hc:CoverView">
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
<ScrollViewer>
<WrapPanel x:Name="PART_Panel" />
</ScrollViewer>
<WrapPanel x:Name="PART_Panel" />
</Border>
</ControlTemplate>
</Setter.Value>