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

chore: add watermark demo.

Browse Source
This commit is contained in:
NaBian committed 2022-10-16 00:08:58 +08:00
1 parent 9afb1913d7
commit 254cc534f0
23 files changed
+117 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+3
View File
@@ -273,6 +273,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GoToTop_16x.png">
<Link>Resources\Img\LeftMainContent\GoToTop_16x.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GridLight_16x.png">
<Link>Resources\Img\LeftMainContent\GridLight_16x.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GroupBox_16x.png">
<Link>Resources\Img\LeftMainContent\GroupBox_16x.png</Link>
</Resource>
src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+3
View File
@@ -275,6 +275,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GoToTop_16x.png">
<Link>Resources\Img\LeftMainContent\GoToTop_16x.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GridLight_16x.png">
<Link>Resources\Img\LeftMainContent\GridLight_16x.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GroupBox_16x.png">
<Link>Resources\Img\LeftMainContent\GroupBox_16x.png</Link>
</Resource>
src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+7
View File
@@ -260,6 +260,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\WaterfallPanelDemoCtl.xaml">
<Link>UserControl\Controls\WaterfallPanelDemoCtl.xaml</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\WatermarkDemoCtl.xaml">
<Link>UserControl\Controls\WatermarkDemoCtl.xaml</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\WindowDemoCtl.xaml">
<Link>UserControl\Controls\WindowDemoCtl.xaml</Link>
</Resource>
@@ -702,6 +705,10 @@
<Link>UserControl\Controls\UniformSpacingPanelDemoCtl.xaml.cs</Link>
<DependentUpon>UniformSpacingPanelDemoCtl.xaml</DependentUpon>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\WatermarkDemoCtl.xaml.cs">
<Link>UserControl\Controls\WatermarkDemoCtl.xaml.cs</Link>
<DependentUpon>WatermarkDemoCtl.xaml</DependentUpon>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs">
<Link>UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs</Link>
<DependentUpon>WaterfallPanelDemoCtl.xaml</DependentUpon>
src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+2 -1
View File
@@ -56,7 +56,7 @@
[ "NumericUpDown", "NumericUpDownDemoCtl", "NumericListBox_16x", "", "DataEntry" ],
[ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "", "DataEntry" ],
[ "ComboBox", "ComboBoxDemoCtl", "ComboBox_16x", "", "DataEntry" ],
[ "CheckComboBox", "CheckComboBoxDemoCtl", "CheckBoxList_16x", "1", "DataEntry" ],
[ "CheckComboBox", "CheckComboBoxDemoCtl", "CheckBoxList_16x", "", "DataEntry" ],
[ "AutoCompleteTextBox", "AutoCompleteTextBoxDemoCtl", "AutoComplete_16x", "1", "DataEntry" ],
[ "PasswordBox", "PasswordBoxDemoCtl", "PasswordBox_16x", "", "DataEntry" ],
[ "PinBox", "PinBoxDemoCtl", "Ellipsis_16x", "", "DataEntry" ],
@@ -106,6 +106,7 @@
[ "Screenshot", "ScreenshotDemoCtl", "WindowScreenshot_16x", "", "" ],
[ "GotoTop", "GotoTopDemoCtl", "GoToTop_16x", "", "" ],
[ "ChatBubble", "ChatBubbleDemoCtl", "Bubble_16xLG", "", "" ],
[ "Watermark", "WatermarkDemoCtl", "GridLight_16x", "1", "" ],
[ "NotifyIcon", "NotifyIconDemoCtl", "NotificationHub_16x", "", "" ],
[ "ImageBrowser", "ImageBrowserDemoCtl", "ImageBrowser_16x", "", "" ],
[ "AnimationPath", "AnimationPathDemoCtl", "Path_16x", "", "" ],
src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+7
View File
@@ -265,6 +265,9 @@
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\UniformSpacingPanelDemoCtl.xaml.cs">
<DependentUpon>UniformSpacingPanelDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\WatermarkDemoCtl.xaml.cs">
<DependentUpon>WatermarkDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs">
<DependentUpon>WaterfallPanelDemoCtl.xaml</DependentUpon>
</Compile>
@@ -816,6 +819,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\WatermarkDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\WaterfallPanelDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
Generated
+12 -1
View File
@@ -20,7 +20,7 @@ namespace HandyControlDemo.Properties.Langs
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Lang
@@ -2555,6 +2555,17 @@ namespace HandyControlDemo.Properties.Langs
}
}
/// <summary>
/// Looks up a localized string similar to 水印.
/// </summary>
public static string Watermark
{
get
{
return ResourceManager.GetString("Watermark", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to 网站.
/// </summary>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ja.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>自动补全文本框</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>水印</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
+3
View File
@@ -801,4 +801,7 @@
<data name="AutoCompleteTextBox" xml:space="preserve">
<value>AutoCompleteTextBox</value>
</data>
<data name="Watermark" xml:space="preserve">
<value>Watermark</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
+11
View File
@@ -263,6 +263,7 @@ public class LangProvider : INotifyPropertyChanged
OnPropertyChanged(nameof(Vsix));
OnPropertyChanged(nameof(Warning));
OnPropertyChanged(nameof(WaterfallPanel));
OnPropertyChanged(nameof(Watermark));
OnPropertyChanged(nameof(Website));
OnPropertyChanged(nameof(Window));
}
@@ -1397,6 +1398,11 @@ public class LangProvider : INotifyPropertyChanged
/// </summary>
public string WaterfallPanel => Lang.WaterfallPanel;
/// <summary>
/// 查找类似 水印 的本地化字符串。
/// </summary>
public string Watermark => Lang.Watermark;
/// <summary>
/// 查找类似 网站 的本地化字符串。
/// </summary>
@@ -2546,6 +2552,11 @@ public class LangKeys
/// </summary>
public static string WaterfallPanel = nameof(WaterfallPanel);
/// <summary>
/// 查找类似 水印 的本地化字符串。
/// </summary>
public static string Watermark = nameof(Watermark);
/// <summary>
/// 查找类似 网站 的本地化字符串。
/// </summary>
src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridLight_16x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
-32
View File
@@ -45,38 +45,6 @@
<Setter Property="Background" Value="Transparent"/>
</Style>
<Style x:Key="ListBoxItemNew" BasedOn="{StaticResource ListBoxItemTransparent}" TargetType="ListBoxItem">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
<StackPanel Orientation="Horizontal">
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
<Path VerticalAlignment="Center" Data="{StaticResource NewGeometry}" Stretch="Uniform" Margin="10,0,0,0" Width="30" Height="14" Fill="{DynamicResource DangerBrush}"/>
</StackPanel>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
<StackPanel Orientation="Horizontal">
<ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}"/>
<ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
<Path VerticalAlignment="Center" Data="{StaticResource NewGeometry}" Stretch="Uniform" Margin="10,0,0,0" Width="30" Height="14" Fill="{DynamicResource DangerBrush}"/>
</StackPanel>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="ListBoxTransparent" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
<Setter Property="hc:BorderElement.CornerRadius" Value="4"/>
<Setter Property="Background" Value="Transparent"/>
src/Shared/HandyControlDemo_Shared/UserControl/Controls/WatermarkDemoCtl.xaml
+27
View File
@@ -0,0 +1,27 @@
<UserControl x:Class="HandyControlDemo.UserControl.WatermarkDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="https://handyorg.github.io/handycontrol"
Background="{DynamicResource RegionBrush}">
<hc:TransitioningContentControl>
<hc:ScrollViewer IsInertiaEnabled="True">
<hc:UniformSpacingPanel VerticalAlignment="Center" Margin="32" ChildWrapping="Wrap" Spacing="16" ItemWidth="256" ItemHeight="128">
<hc:Watermark Mark="HandyControl">
<Border BorderThickness="1" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" />
</hc:Watermark>
<hc:Watermark Mark="HandyControl" FontSize="30">
<Border BorderThickness="1" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" />
</hc:Watermark>
<hc:Watermark Mark="HandyControl" FontSize="30" Angle="45">
<Border BorderThickness="1" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" />
</hc:Watermark>
<hc:Watermark Mark="HandyControl" FontSize="30" Angle="45" MarkBrush="{DynamicResource DangerBrush}">
<Border BorderThickness="1" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" />
</hc:Watermark>
<hc:Watermark Mark="HandyControl" FontSize="30" Angle="45" MarkBrush="{DynamicResource DangerBrush}" MarkMargin="10">
<Border BorderThickness="1" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" />
</hc:Watermark>
</hc:UniformSpacingPanel>
</hc:ScrollViewer>
</hc:TransitioningContentControl>
</UserControl>
src/Shared/HandyControlDemo_Shared/UserControl/Controls/WatermarkDemoCtl.xaml.cs
+9
View File
@@ -0,0 +1,9 @@
namespace HandyControlDemo.UserControl;
public partial class WatermarkDemoCtl
{
public WatermarkDemoCtl()
{
InitializeComponent();
}
}