init branch

2019-07-11 01:10:17 +08:00
1 parent a2aa500acf
commit 6025958365
@@ -102,6 +102,8 @@
 	
        public static readonly string CardDemoCtl = nameof(CardDemoCtl);
 	
+        public static readonly string MagnifierDemoCtl = nameof(MagnifierDemoCtl);
+	
        public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);

        public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl);
@@ -53,7 +53,8 @@ var controlList = new List<string>
 	"GridDemoCtl",
 	"RangeSliderDemoCtl",
 	"ButtonGroupDemoCtl",
-	"CardDemoCtl"
+	"CardDemoCtl",
+	"MagnifierDemoCtl"
 };
 var styleList = new List<string>
 {
@@ -54,6 +54,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\CardDemoCtl.xaml.cs">
      <DependentUpon>CardDemoCtl.xaml</DependentUpon>
    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\MagnifierDemoCtl.xaml.cs">
+      <DependentUpon>MagnifierDemoCtl.xaml</DependentUpon>
+    </Compile>
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\RangeSliderDemoCtl.xaml.cs">
      <DependentUpon>RangeSliderDemoCtl.xaml</DependentUpon>
    </Compile>
@@ -420,6 +423,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\MagnifierDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\RelativePanelDemoCtl.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -771,6 +771,15 @@ namespace HandyControlDemo.Properties.Langs {
            }
        }
        
+        /// <summary>
+        ///   查找类似 放大镜 的本地化字符串。
+        /// </summary>
+        public static string Magnifier {
+            get {
+                return ResourceManager.GetString("Magnifier", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 菜单 的本地化字符串。
        /// </summary>
@@ -627,4 +627,7 @@
  <data name="TextDialogWithTimer" xml:space="preserve">
    <value>TextDialog with timer</value>
  </data>
+  <data name="Magnifier" xml:space="preserve">
+    <value>Magnifier</value>
+  </data>
 </root>
@@ -627,4 +627,7 @@
  <data name="TextDialogWithTimer" xml:space="preserve">
    <value>文本对话框，带计时器</value>
  </data>
+  <data name="Magnifier" xml:space="preserve">
+    <value>放大镜</value>
+  </data>
 </root>
@@ -0,0 +1,15 @@
+<UserControl x:Class="HandyControlDemo.UserControl.MagnifierDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Background="{DynamicResource RegionBrush}"
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+        <hc:SimplePanel>
+            <Image Name="ImageDemo" Source="/HandyControlDemo;component/Resources/Img/1.jpg" Stretch="None">
+                <hc:Magnifier.Instance>
+                    <hc:Magnifier Scale="5"/>
+                </hc:Magnifier.Instance>
+            </Image>
+        </hc:SimplePanel>
+    </hc:TransitioningContentControl>
+</UserControl>
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class MagnifierDemoCtl
+    {
+        public MagnifierDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -195,6 +195,11 @@
                        </hc:StatusSwitchElement.CheckedElement>
                    </ToggleButton>
                    <ListBox Name="ListBoxControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single"  Style="{StaticResource ListBoxTransparent}">
+                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.MagnifierDemoCtl}" Content="{x:Static langs:Lang.Magnifier}">
+                            <hc:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Search_16x.png"/>
+                            </hc:EdgeElement.LeftContent>
+                        </ListBoxItem>
                        <ListBoxItem Tag="{x:Static data:MessageToken.GravatarDemoCtl}" Content="{x:Static langs:Lang.Gravatar}">
                            <hc:EdgeElement.LeftContent>
                                <Image Source="../../Resources/Img/LeftMainContent/User_16x.png"/>
@@ -415,7 +420,7 @@
                                <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
                            </hc:EdgeElement.LeftContent>
                        </ListBoxItem>
-                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.SideMenuDemoCtl}" Content="{x:Static langs:Lang.SideMenu}">
+                        <ListBoxItem Tag="{x:Static data:MessageToken.SideMenuDemoCtl}" Content="{x:Static langs:Lang.SideMenu}">
                            <hc:EdgeElement.LeftContent>
                                <Image Source="../../Resources/Img/LeftMainContent/MainMenuControl_16x.png"/>
                            </hc:EdgeElement.LeftContent>