add Poptip

AdarshRise · Nov 7, 2019 · cf5c9c6 · cf5c9c6
1 parent 3192832
commit cf5c9c6
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -65,6 +65,10 @@ Step 4：enjoy coding
 
 ## Latest examples
 
+### Poptip
+
+![Poptip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Poptip.gif)
+
 ### Divider
 
 ![Divider](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Divider.png)
@@ -81,12 +85,12 @@ Step 4：enjoy coding
 
 ![FloatingBlock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FloatingBlock.gif)
 
+## History publication
+
 ### HoneycombPanel
 
 ![HoneycombPanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/HoneycombPanel.png)
 
-## History publication
-
 ### RunningBlock
 
 ![RunningBlock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/RunningBlock.gif)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
@@ -8,12 +8,21 @@
     <UserControl.Resources>
         <Style x:Key="Button4PoptipStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
             <Setter Property="Width" Value="{x:Static system:Double.NaN}"/>
+            <Setter Property="Height" Value="50"/>
+            <Setter Property="MinWidth" Value="100"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="Content" Value="{Binding Tag,RelativeSource={RelativeSource Self},Converter={StaticResource Int2StringConverter},ConverterParameter={x:Static langs:Lang.PoptipPositionStr}}"/>
+        </Style>
+        <Style x:Key="ToggleButton4PoptipStyle" BasedOn="{StaticResource {x:Type ToggleButton}}" TargetType="ToggleButton">
+            <Setter Property="Width" Value="{x:Static system:Double.NaN}"/>
+            <Setter Property="Height" Value="50"/>
+            <Setter Property="MinWidth" Value="100"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="Content" Value="{Binding Tag,RelativeSource={RelativeSource Self},Converter={StaticResource Int2StringConverter},ConverterParameter={x:Static langs:Lang.PoptipPositionStr}}"/>
         </Style>
     </UserControl.Resources>
     <hc:TransitioningContentControl>
-        <Grid Margin="24,32">
+        <Grid Margin="24,320">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
@@ -25,24 +34,44 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <UniformGrid Grid.Column="1" Columns="3">
-                <Button Margin="8,0" Tag="0" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button Margin="8,0" Tag="1" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button Margin="8,0" Tag="2" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,0" Tag="0" Style="{StaticResource Button4PoptipStyle}">
+                    <hc:Poptip.Instance>
+                        <hc:Poptip Content="{x:Static langs:Lang.Text}" Placement="TopLeft"/>
+                    </hc:Poptip.Instance>
+                </Button>
+                <Button Margin="8,0" Tag="1" Style="{StaticResource Button4PoptipStyle}">
+                    <hc:Poptip.Instance>
+                        <hc:Poptip Placement="Top">
+                            <hc:Poptip.Content>
+                                <Path Width="100" Height="100" Fill="#f06632" Data="{StaticResource LogoGeometry}"/>
+                            </hc:Poptip.Content>
+                        </hc:Poptip>
+                    </hc:Poptip.Instance>
+                </Button>
+                <Button hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="TopRight" Margin="8,0" Tag="2" Style="{StaticResource Button4PoptipStyle}"/>
             </UniformGrid>
             <UniformGrid Grid.Row="1" Grid.Column="2" Rows="3">
-                <Button Margin="8,16" Tag="3" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button Margin="8,16" Tag="4" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button Margin="8,16" Tag="5" Style="{StaticResource Button4PoptipStyle}"/>
+                <ToggleButton hc:Poptip.HitMode="None" hc:Poptip.IsOpen="{Binding IsChecked,RelativeSource={RelativeSource Self}}" hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="RightTop" Margin="8,16" Tag="3" Style="{StaticResource ToggleButton4PoptipStyle}"/>
+                <ToggleButton Margin="8,16" Tag="4" Style="{StaticResource ToggleButton4PoptipStyle}">
+                    <hc:Poptip.Instance>
+                        <hc:Poptip Background="Transparent" Padding="0" BorderThickness="0" HitMode="None" Placement="Right" IsOpen="{Binding Target.IsChecked,RelativeSource={RelativeSource Self}}">
+                            <hc:Poptip.Content>
+                                <Path Width="100" Height="100" Fill="#f06632" Data="{StaticResource LogoGeometry}"/>
+                            </hc:Poptip.Content>
+                        </hc:Poptip>
+                    </hc:Poptip.Instance>
+                </ToggleButton>
+                <ToggleButton hc:Poptip.HitMode="None" hc:Poptip.IsOpen="{Binding IsChecked,RelativeSource={RelativeSource Self}}" hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="RightBottom" Margin="8,16" Tag="5" Style="{StaticResource ToggleButton4PoptipStyle}"/>
             </UniformGrid>
             <UniformGrid Grid.Column="1" Grid.Row="2" Columns="3">
-                <Button Margin="8,0" Tag="8" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button Margin="8,0" Tag="7" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button Margin="8,0" Tag="6" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="BottomLeft" Margin="8,0" Tag="8" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="Bottom" Margin="8,0" Tag="7" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="BottomRight" Margin="8,0" Tag="6" Style="{StaticResource Button4PoptipStyle}"/>
             </UniformGrid>
             <UniformGrid Grid.Row="1" Grid.Column="0" Rows="3">
-                <Button Margin="8,16" Tag="11" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button Margin="8,16" Tag="10" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button Margin="8,16" Tag="9" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="LeftTop" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="11" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="Left" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="10" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{x:Static langs:Lang.Text}" hc:Poptip.Placement="LeftBottom" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="9" Style="{StaticResource Button4PoptipStyle}"/>
             </UniformGrid>
         </Grid>
     </hc:TransitioningContentControl>