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

Synchronize the Net40

Browse Source 
1. synchronize the Net40
2. fixed a bug of coverview
This commit is contained in:
NaBian committed 2019-02-22 16:51:31 +08:00
1 parent 52656563b7
commit 36008d83e2
13 files changed
+112 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

HandyControl/Controls/Cover/CoverView/CoverView.cs
+23 -7
View File
@@ -18,6 +18,8 @@ namespace HandyControl.Controls
private readonly Dictionary<object, CoverViewItem> _entryDic = new Dictionary<object, CoverViewItem>();
private bool _isRefresh;
public CoverView()
{
_viewContent = new CoverViewContent();
@@ -171,12 +173,15 @@ namespace HandyControl.Controls
if (ItemsHost == null) return;
_entryDic.Clear();
_isRefresh = true;
foreach (var item in Items)
{
AddItem(item);
}
_isRefresh = false;
GenerateIndex();
UpdateCoverViewContent(_viewContent.IsOpen);
@@ -214,6 +219,10 @@ namespace HandyControl.Controls
/// </summary>
private void UpdateCoverViewContentPosition()
{
if (_viewContent.Parent != null)
{
ItemsHost.Children.Remove(_viewContent);
}
var total = Items.Count + 1;
var totalRow = total / Groups + (total % Groups > 0 ? 1 : 0);
if (total <= Groups)
@@ -245,6 +254,7 @@ namespace HandyControl.Controls
s.CollectionChanged -= InternalCollectionChanged;
}
Items.Clear();
ClearItems();
}
_itemsSourceInternal = newValue;
@@ -269,9 +279,13 @@ namespace HandyControl.Controls
private void ClearItems()
{
_selectedItem = null;
if (_viewContent != null)
_viewContent.Content = null;
_viewContent.ContentTemplate = null;
if (ItemsHost != null)
{
ItemsHost?.Children.Remove(_viewContent);
ItemsHost.Children.Remove(_viewContent);
ItemsHost.Children.Clear();
}
_entryDic.Clear();
@@ -330,6 +344,11 @@ namespace HandyControl.Controls
}
_entryDic[item] = element;
ItemsHost.Children.Insert(index, element);
if (IsLoaded && !_isRefresh && _itemsSourceInternal != null)
{
Items.Insert(index, item);
}
}
}
}
@@ -352,8 +371,9 @@ namespace HandyControl.Controls
if (e.Action == NotifyCollectionChangedAction.Reset)
{
if (_entryDic.Count == 0) return;
ClearItems();
ItemsHost?.Children.Clear();
Items.Clear();
return;
}
@@ -376,10 +396,6 @@ namespace HandyControl.Controls
{
var index = e.NewStartingIndex + count++;
InsertItem(index, item);
if (_itemsSourceInternal != null)
{
Items.Insert(index, item);
}
}
}
Net40/HandyControlDemo_Net40/Data/MessageToken.cs
+2
View File
@@ -134,6 +134,8 @@
public static readonly string ToolBarDemoCtl = nameof(ToolBarDemoCtl);
public static readonly string LabelDemoCtl = nameof(LabelDemoCtl);
public static readonly string CommonWindow = nameof(CommonWindow);
public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow);
Net40/HandyControlDemo_Net40/Data/MessageToken.tt
+2 -1
View File
@@ -72,7 +72,8 @@ var styleList = new List<string>
"GroupBoxDemoCtl",
"ListViewDemoCtl",
"RichTextBoxDemoCtl",
"ToolBarDemoCtl"
"ToolBarDemoCtl",
"LabelDemoCtl"
};
var windowList = new List<string>
{
Net40/HandyControlDemo_Net40/HandyControlDemo_Net40.csproj
+8
View File
@@ -241,6 +241,9 @@
<Compile Include="UserControl\Styles\GroupBoxDemoCtl.xaml.cs">
<DependentUpon>GroupBoxDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Styles\LabelDemoCtl.xaml.cs">
<DependentUpon>LabelDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Styles\ListViewDemoCtl.xaml.cs">
<DependentUpon>ListViewDemoCtl.xaml</DependentUpon>
</Compile>
@@ -580,6 +583,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Styles\LabelDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Styles\ListViewDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -718,6 +725,7 @@
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>MessageToken.cs</LastGenOutput>
</Content>
<Resource Include="Resources\Img\LeftMainContent\Label_16x.png" />
<Resource Include="Resources\Img\Chat\chat_back1.jpg" />
<Resource Include="Resources\Img\Chat\chat_back2.jpg" />
<Resource Include="Resources\Img\LeftMainContent\Bubble_16xLG.png" />
Net40/HandyControlDemo_Net40/Properties/Langs/Lang.Designer.cs
Generated
+9
View File
@@ -564,6 +564,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
/// <summary>
/// 查找类似 标签 的本地化字符串。
/// </summary>
public static string Label {
get {
return ResourceManager.GetString("Label", resourceCulture);
}
}
/// <summary>
/// 查找类似 列表框 的本地化字符串。
/// </summary>
Net40/HandyControlDemo_Net40/Properties/Langs/Lang.en.resx
+3
View File
@@ -495,4 +495,7 @@
<data name="Second" xml:space="preserve">
<value>Sec</value>
</data>
<data name="Label" xml:space="preserve">
<value>Label</value>
</data>
</root>
Net40/HandyControlDemo_Net40/Properties/Langs/Lang.resx
+3
View File
@@ -495,4 +495,7 @@
<data name="Second" xml:space="preserve">
<value>秒</value>
</data>
<data name="Label" xml:space="preserve">
<value>标签</value>
</data>
</root>
Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Label_16x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 247 B

Net40/HandyControlDemo_Net40/UserControl/Main/LeftMainContent.xaml
+5
View File
@@ -159,6 +159,11 @@
<Image Source="../../Resources/Img/LeftMainContent/BorderElement_16x.png"/>
</controls:EdgeElement.LeftContent>
</ListBoxItem>
<ListBoxItem Tag="{x:Static data:MessageToken.LabelDemoCtl}" Content="{x:Static langs:Lang.Label}">
<controls:EdgeElement.LeftContent>
<Image Source="../../Resources/Img/LeftMainContent/Label_16x.png"/>
</controls:EdgeElement.LeftContent>
</ListBoxItem>
</ListBox>
</Grid>
</TabItem>
Net40/HandyControlDemo_Net40/UserControl/Styles/LabelDemoCtl.xaml
+17
View File
@@ -0,0 +1,17 @@
<UserControl x:Class="HandyControlDemo.UserControl.LabelDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
Background="{DynamicResource RegionBrush}">
<controls:TransitioningContentControl>
<StackPanel Margin="32">
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelDanger}"/>
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelInfo}"/>
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelPrimary}"/>
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelSuccess}"/>
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelWarning}"/>
</StackPanel>
</controls:TransitioningContentControl>
</UserControl>
Net40/HandyControlDemo_Net40/UserControl/Styles/LabelDemoCtl.xaml.cs
+10
View File
@@ -0,0 +1,10 @@
namespace HandyControlDemo.UserControl
{
public partial class LabelDemoCtl
{
public LabelDemoCtl()
{
InitializeComponent();
}
}
}
Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverView.cs
+29 -6
View File
@@ -18,6 +18,8 @@ namespace HandyControl.Controls
private readonly Dictionary<object, CoverViewItem> _entryDic = new Dictionary<object, CoverViewItem>();
private bool _isRefresh;
public CoverView()
{
_viewContent = new CoverViewContent();
@@ -171,12 +173,15 @@ namespace HandyControl.Controls
if (ItemsHost == null) return;
_entryDic.Clear();
_isRefresh = true;
foreach (var item in Items)
{
AddItem(item);
}
_isRefresh = false;
GenerateIndex();
UpdateCoverViewContent(_viewContent.IsOpen);
@@ -214,6 +219,10 @@ namespace HandyControl.Controls
/// </summary>
private void UpdateCoverViewContentPosition()
{
if (_viewContent.Parent != null)
{
ItemsHost.Children.Remove(_viewContent);
}
var total = Items.Count + 1;
var totalRow = total / Groups + (total % Groups > 0 ? 1 : 0);
if (total <= Groups)
@@ -245,6 +254,7 @@ namespace HandyControl.Controls
s.CollectionChanged -= InternalCollectionChanged;
}
Items.Clear();
ClearItems();
}
_itemsSourceInternal = newValue;
@@ -269,9 +279,13 @@ namespace HandyControl.Controls
private void ClearItems()
{
_selectedItem = null;
if (_viewContent != null)
_viewContent.Content = null;
_viewContent.ContentTemplate = null;
if (ItemsHost != null)
{
ItemsHost?.Children.Remove(_viewContent);
ItemsHost.Children.Remove(_viewContent);
ItemsHost.Children.Clear();
}
_entryDic.Clear();
@@ -330,6 +344,11 @@ namespace HandyControl.Controls
}
_entryDic[item] = element;
ItemsHost.Children.Insert(index, element);
if (IsLoaded && !_isRefresh && _itemsSourceInternal != null)
{
Items.Insert(index, item);
}
}
}
}
@@ -350,6 +369,14 @@ namespace HandyControl.Controls
{
if (ItemsHost == null) return;
if (e.Action == NotifyCollectionChangedAction.Reset)
{
if (_entryDic.Count == 0) return;
ClearItems();
Items.Clear();
return;
}
if (e.OldItems != null)
{
foreach (var item in e.OldItems)
@@ -369,10 +396,6 @@ namespace HandyControl.Controls
{
var index = e.NewStartingIndex + count++;
InsertItem(index, item);
if (_itemsSourceInternal != null)
{
Items.Insert(index, item);
}
}
}
Net40/HandyControl_Net40/Controls/Window/MessageBox.cs
+1 -1
View File
@@ -297,7 +297,7 @@ namespace HandyControl.Controls
Owner = ownerWindow,
WindowStartupLocation = ownerIsNull ? WindowStartupLocation.CenterScreen : WindowStartupLocation.CenterOwner,
ShowTitle = true,
Title = caption,
Title = caption ?? string.Empty,
Topmost = ownerIsNull,
_messageBoxResult = defaultResult
};