Browse Source

右击菜单-部分点击无效修复

liyijie 1 year ago
parent
commit
118a80882a

+ 1 - 1
PDF Office/App.xaml

@@ -107,7 +107,7 @@
                                     <ContentPresenter
                                         x:Name="IGTHost"
                                         Grid.Column="2"
-                                        Margin="8,0"
+                                        Margin="0,0"
                                         VerticalAlignment="Center"
                                         ContentSource="InputGestureText" />
                                     <Grid

+ 8 - 3
PDF Office/Styles/RadioButtonStyle.xaml

@@ -434,13 +434,16 @@
     <Style x:Key="MenuRadioBtnStyle" TargetType="{x:Type RadioButton}">
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Margin" Value="-3" />
         <Setter Property="Template">
+            
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
                     <Border
                         x:Name="templateRoot"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="0"
+                        CornerRadius="7"
+                        Background="Transparent"
+                        Height="32"
                         SnapsToDevicePixels="True">
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -449,6 +452,8 @@
                             </Grid.ColumnDefinitions>
 
                             <Path
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
                                 x:Name="pathIcon"
                                 Data="M11.1144 1.57308L5.71438 9.28737C5.58464 9.47271 5.37817 9.58958 5.15248 9.60543C4.9268 9.62128 4.70603 9.5344 4.55166 9.36901L0.95166 5.51187L2.04824 4.48839L5.01649 7.66866L9.88553 0.712891L11.1144 1.57308Z"
                                 Fill="{StaticResource color.icon.base.neutral.norm.lv1}"
@@ -459,7 +464,7 @@
                                 Grid.Column="1"
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                VerticalAlignment="Center"
                                 Focusable="False"
                                 RecognizesAccessKey="True"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+ 1 - 0
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Layout.cs

@@ -802,6 +802,7 @@ namespace PDF_Master.ViewModels.Tools
                 familyRdioBtn.Tag = item.ValueStr;
                 familyRdioBtn.GroupName = "FontFamily";
                 familyRdioBtn.Content = item.Content;
+
                 pop.BindingEvent(pop.AddChild("FreeTextFontFamily", familyRdioBtn), FreeTextFontFamily_MenuCommand);
             }