编辑PDF - UI

PDF Office/App.xaml.cs

@@ -127,6 +127,7 @@ namespace PDF_Office
             containerRegistry.RegisterForNavigation<PageEditContent>();
             containerRegistry.RegisterForNavigation<BottomToolContent>();
             containerRegistry.RegisterForNavigation<ToolsBarContent>();
+            containerRegistry.RegisterForNavigation<TextEditToolContent>();
             containerRegistry.RegisterForNavigation<AnnotToolContent>();
             containerRegistry.RegisterForNavigation<BookmarkContent>();
             containerRegistry.RegisterForNavigation<SearchContent>();

PDF Office/Styles/RadioButtonStyle.xaml

@@ -259,4 +259,49 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!--悬浮灰色背景单选按钮-->
+    <Style x:Key="GreyBgRadioBtnStyle" TargetType="{x:Type RadioButton}">
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Foreground" Value="#252629"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Border x:Name="templateRoot" Background="{TemplateBinding Background}"  CornerRadius="4" SnapsToDevicePixels="True">
+
+                            <ContentPresenter x:Name="contentPresenter" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasContent" Value="true">
+                            <Setter Property="FocusVisualStyle" Value="{StaticResource OptionMarkFocusVisual}"/>
+                            <Setter Property="Padding" Value="4,-1,0,0"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" TargetName="templateRoot" Value="#EDEEF0"/>
+
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Background" TargetName="templateRoot">
+                                <Setter.Value>
+                                    <SolidColorBrush Color="#CED0D4" Opacity="0.6"/>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#CED0D4"/>
+                            <Setter Property="Foreground" Value="#616469"/>
+                            <Setter Property="BorderThickness" TargetName="templateRoot" Value="1"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="{x:Null}">
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>

PDF Office/ViewModels/Tools/TextEditToolContentViewModel.cs

@@ -10,6 +10,7 @@ namespace PDF_Office.ViewModels.Tools
 {
     public class TextEditToolContentViewModel: BindableBase
     {
+       private ComPDFKitViewer.PDFEditEvent TextEditEvent;
         public DelegateCommand<object> AddContentCommand { get; set; }
         public TextEditToolContentViewModel()
         {
@@ -18,7 +19,10 @@ namespace PDF_Office.ViewModels.Tools
 
         public void AddContent(object obj)
         {
-           
+           if(TextEditEvent != null)
+            {
+
+            }
         }
 
     }

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -51,7 +51,8 @@ namespace PDF_Office.ViewModels
         public string ReadModeRegionName { get; set; }
 
         public string ConverterBarContentRegionName { get; set; }
-
+        public string TextEditContentRegionName { get; set; }
+        
         public string BackgroundContentRegionName { get; set; }
 
         /// <summary>
@@ -213,6 +214,22 @@ namespace PDF_Office.ViewModels
             }
         }
 
+        private Visibility textEditToolContentVisible = Visibility.Collapsed;
+
+        /// <summary>
+        /// 控制ToolsBarContent的显示
+        /// 留意：显示前需要先注入内容、设置好行和跨行数
+        /// </summary>
+        public Visibility TextEditToolContentVisible
+        {
+            get { return textEditToolContentVisible; }
+            set
+            {
+                SetProperty(ref textEditToolContentVisible, value);
+            }
+        }
+
+
         private bool isPorpertyOpen = false;
 
         /// <summary>
@@ -399,6 +416,7 @@ namespace PDF_Office.ViewModels
             ToolContentRegionName = Guid.NewGuid().ToString();
             ToolsBarContentRegionName = Guid.NewGuid().ToString();
             ConverterBarContentRegionName = Guid.NewGuid().ToString();
+            TextEditContentRegionName = Guid.NewGuid().ToString();
 
             ToolContentVisible = Visibility.Collapsed;
             ToolsBarContentVisible = Visibility.Collapsed;
@@ -426,7 +444,7 @@ namespace PDF_Office.ViewModels
             dictionary.Add("TabItemAnnotation", ToolsBarContentRegionName);
             dictionary.Add("TabItemConvert", ConverterBarContentRegionName);
             dictionary.Add("TabItemScan", ToolsBarContentRegionName);
-            dictionary.Add("TabItemEdit", ToolsBarContentRegionName);
+            dictionary.Add("TabItemEdit", TextEditContentRegionName);
             dictionary.Add("TabItemForm", ToolsBarContentRegionName);
             dictionary.Add("TabItemFill", ToolsBarContentRegionName);
         }
@@ -438,7 +456,7 @@ namespace PDF_Office.ViewModels
             dictionary.Add("TabItemAnnotation", "AnnotToolContent");
             dictionary.Add("TabItemConvert", "ConverterBarContent");
             dictionary.Add("TabItemScan", "");
-            dictionary.Add("TabItemEdit", "");
+            dictionary.Add("TabItemEdit", "TextEditToolContent");
             dictionary.Add("TabItemForm", "");
             dictionary.Add("TabItemFill", "FillAndSignContent");
         }
@@ -448,23 +466,25 @@ namespace PDF_Office.ViewModels
             ToolContentVisible = Visibility.Collapsed;
             ToolsBarContentVisible = Visibility.Collapsed;
             ConverterBarContentVisible = Visibility.Collapsed;
+            TextEditToolContentVisible = Visibility.Collapsed;
+
             switch (currentBar)
             {
                 case "TabItemAnnotation":
                 case "TabItemScan":
                 case "TabItemTool":
                 case "TabItemForm":
-                case "TabItemEdit":
                     ToolsBarContentVisible = Visibility.Visible;
-                    if(currentBar == "TabItemEdit")
+                    break;
+                case "TabItemEdit":
+                    TextEditToolContentVisible = Visibility.Visible;
+                    IsPropertyOpen = true;
+                    if (IsPropertyOpen == true)
                     {
-                        IsPropertyOpen = !IsPropertyOpen;
-                        if(IsPropertyOpen == true)
+                        PDFViewer.SetMouseMode(MouseModes.PDFEdit);
                         SelectedPrpoertyPanel("TextEditProperty", null);
                     }
-                    
                     break;
-
                 case "TabItemConvert":
                     ConverterBarContentVisible = Visibility.Visible;
                     break;

PDF Office/Views/PropertyPanel/TextEditProperty.xaml

@@ -17,6 +17,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="../../Styles/SliderStyle.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="../../Styles/CustomBtnStyle.xaml"/>
+                <ResourceDictionary Source="../../Styles/RadioButtonStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Convert:CheckToVisibleMutiConvert x:Key="CheckToVisibleMutiConvert"/>
@@ -60,6 +61,7 @@
                     <TextBlock Text="{Binding mFontStyleName}" Foreground="Black"/>
                 </Grid>
             </DataTemplate>
+
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid Background="#F3F3F3">
@@ -129,7 +131,7 @@
                     <RowDefinition Height="auto"></RowDefinition>
                 </Grid.RowDefinitions>
 
-                <Border BorderBrush="#E2E3E6"  Width="148" Height="32" Margin="12,0,4,0"  BorderThickness="0">
+                <Border BorderBrush="#E2E3E6" Grid.ColumnSpan="2"  Width="228" Height="32" Margin="12,0,4,0"  BorderThickness="0">
                     <Grid>
                         <ComboBox IsReadOnly="True" Name="FontFamilyBox" Background="Transparent" Padding="10 10 0 0"  BorderThickness="1" BorderBrush="#FFE2E3E6"
                                 >
@@ -160,7 +162,7 @@
                     </Grid>
                 </Border>
 
-                <cus:ColorDropBox x:Name="FontColorBox" Grid.Column="1" Grid.Row="1" SelectedColorChanged="FontColorBox_SelectedColorChanged" BorderThickness="1" BorderBrush="#E2E3E6" Width="80" Height="32" HorizontalAlignment="Left"
+                <cus:ColorDropBox x:Name="FontColorBox" Grid.Column="1" Grid.Row="2" SelectedColorChanged="FontColorBox_SelectedColorChanged" BorderThickness="1" BorderBrush="#E2E3E6" Width="80" Height="32" HorizontalAlignment="Left"
                                    ></cus:ColorDropBox>
 
                 <Border Grid.Row="1" BorderBrush="#E2E3E6"  Width="148" Height="32" Margin="12,8,4,0"  BorderThickness="0">
@@ -188,7 +190,7 @@
                     </Grid>
                 </Border>
 
-                <Border Grid.Row="0" Grid.Column="1" BorderBrush="#E2E3E6"  Width="80" Height="32" Margin="-1,8,0,0"  BorderThickness="0">
+                <Border Grid.Row="1" Grid.Column="1" BorderBrush="#E2E3E6"  Width="80" Height="32" Margin="-1,8,0,0"  BorderThickness="0">
                     <Grid>
                         <ComboBox Name="FontSizeBox" BorderThickness="1" Background="Transparent" BorderBrush="#FFE2E3E6"
                                   MaxDropDownHeight="200">
@@ -226,121 +228,114 @@
                 </Border>
 
 
-                <Border Grid.ColumnSpan="2" Grid.Row="2" Width="148" Height="32" Margin="12,8,0,0" BorderThickness="1" BorderBrush="#FFE2E3E6" HorizontalAlignment="Left">
+                <Border Grid.ColumnSpan="2" Grid.Row="2" Width="148"  Margin="12,8,0,0"  HorizontalAlignment="Left">
                     <Grid Name="ToolGrid">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"></ColumnDefinition>
                             <ColumnDefinition Width="*"></ColumnDefinition>
                             <ColumnDefinition Width="*"></ColumnDefinition>
+                            <ColumnDefinition Width="*"></ColumnDefinition>
                         </Grid.ColumnDefinitions>
 
-                        <ToggleButton Name="TextAlignLeftBtn" Tag="AlignLeft" Background="Transparent" BorderThickness="0" Click="BtnTextAlign_Click">
-                            <Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="#000000" Data="M10,11 L10,12 L0,12 L0,11 L10,11 Z M16,7 L16,8 L0,8 L0,7 L16,7 Z M13,3 L13,4 L0,4 L0,3 L13,3 Z">
-                            </Path>
-                            <i:Interaction.Triggers>
-                                <i:EventTrigger EventName="Checked">
-                                    <i:InvokeCommandAction Command="{Binding TextAlignChecked}" CommandParameter="{Binding ElementName=TextAlignLeftBtn,Path=Tag}"/>
-                                </i:EventTrigger>
-                            </i:Interaction.Triggers>
-                        </ToggleButton>
-                        <Line HorizontalAlignment="Left" Style="{StaticResource line1Style}" VerticalAlignment="Center" Grid.Column="1" X1="0" Y1="0" X2="0" Y2="16" StrokeThickness="1" Stroke="#33000000"></Line>
 
-                        <ToggleButton Name="TextAlignCenterBtn" Tag="AlignCenter" Grid.Column="1" Background="Transparent"  BorderThickness="0"  Click="BtnTextAlign_Click">
-                            <Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="#000000" Data="M16,11 L16,12 L0,12 L0,11 L16,11 Z M13,7 L13,8 L3,8 L3,7 L13,7 Z M16,3 L16,4 L0,4 L0,3 L16,3 Z">
-                            </Path>
-                            <i:Interaction.Triggers>
-                                <i:EventTrigger EventName="Checked">
-                                    <i:InvokeCommandAction Command="{Binding TextAlignChecked}" CommandParameter="{Binding ElementName=TextAlignCenterBtn,Path=Tag}"/>
-                                </i:EventTrigger>
-                            </i:Interaction.Triggers>
-                        </ToggleButton>
-                        <Line HorizontalAlignment="Left" Style="{StaticResource line2Style}" VerticalAlignment="Center" Grid.Column="2" X1="0" Y1="0" X2="0" Y2="16" StrokeThickness="1" Stroke="#33000000"></Line>
 
-                        <ToggleButton Name="TextAlignRightBtn" Tag="AlignRight" Grid.Column="2" Background="Transparent"  BorderThickness="0"  Click="BtnTextAlign_Click">
-                            <Path HorizontalAlignment="Center" VerticalAlignment="Center"  Fill="#000000" Data="M16,11 L16,12 L6.00061035,12 L6.00061035,11 L16,11 Z M16,7 L16,8 L0.0009765625,8 L0.0009765625,7 L16,7 Z M16,3 L16,4 L3.00079346,4 L3.00079346,3 L16,3 Z">
-                            </Path>
-                            <i:Interaction.Triggers>
-                                <i:EventTrigger EventName="Checked">
-                                    <i:InvokeCommandAction Command="{Binding TextAlignChecked}" CommandParameter="{Binding ElementName=TextAlignRightBtn,Path=Tag}"/>
-                                </i:EventTrigger>
-                            </i:Interaction.Triggers>
-                        </ToggleButton>
+                        <RadioButton x:Name="TextAlignLeftBtn" Tag="AlignLeft" GroupName="TextAlign" Width="32" Height="32" Foreground="#616469"  Background="Transparent" VerticalContentAlignment="Center"
+                                      Style="{DynamicResource GreyBgRadioBtnStyle}" >
+                            <RadioButton.Content>
+                                <Grid Width="32" Height="32">
+                                    <Canvas Margin="5,10,0,0">
+                                        <Rectangle Canvas.Top="0.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignLeftBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Top="4.25" Width="8" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignLeftBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Top="12.25" Width="8" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignLeftBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Top="8.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignLeftBtn,Path=Foreground}"/>
+                                    </Canvas>
+                                </Grid>
+                            </RadioButton.Content>
+                        </RadioButton>
+
+                        <RadioButton x:Name="TextAlignCenterBtn" Grid.Column="1" Tag="AlignCenter" GroupName="TextAlign" Width="32" Height="32" Foreground="#616469" Background="Transparent" VerticalContentAlignment="Center"
+                                      Style="{DynamicResource GreyBgRadioBtnStyle}" >
+                            <RadioButton.Content>
+                                <Grid Width="32" Height="32">
+                                    <Canvas Margin="5,10,0,0">
+                                        <Rectangle Canvas.Top="0.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignCenterBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Left="3" Canvas.Top="4.25" Width="8" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignCenterBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Left="3" Canvas.Top="12.25" Width="8" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignCenterBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Top="8.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignCenterBtn,Path=Foreground}"/>
+                                    </Canvas>
+                                </Grid>
+                            </RadioButton.Content>
+                        </RadioButton>
+
+                        <RadioButton x:Name="TextAlignRightBtn" Grid.Column="2" Tag="AlignRight" GroupName="TextAlign" Width="32" Height="32" Foreground="#616469" Background="Transparent" VerticalContentAlignment="Center"
+                                      Style="{DynamicResource GreyBgRadioBtnStyle}" >
+                            <RadioButton.Content>
+                                <Grid Width="32" Height="32">
+                                    <Canvas Margin="5,10,0,0">
+                                        <Rectangle Canvas.Top="0.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignRightBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Left="6" Canvas.Top="4.25" Width="8" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignRightBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Left="6" Canvas.Top="12.25" Width="8" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignRightBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Top="8.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignRightBtn,Path=Foreground}"/>
+                                    </Canvas>
+                                </Grid>
+                            </RadioButton.Content>
+                        </RadioButton>
+
+                        <RadioButton x:Name="TextAlignBtn" Grid.Column="3" Tag="Align" GroupName="TextAlign" Width="32" Height="32" Foreground="#616469" Background="Transparent" VerticalContentAlignment="Center"
+                                      Style="{DynamicResource GreyBgRadioBtnStyle}" >
+                            <RadioButton.Content>
+                                <Grid Width="32" Height="32">
+                                    <Canvas Margin="5,10,0,0">
+                                        <Rectangle Canvas.Top="0.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Top="8.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Top="4.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignBtn,Path=Foreground}"/>
+                                        <Rectangle Canvas.Top="12.25" Width="14" Height="1.5" StrokeThickness="1.5" Stroke="{Binding ElementName=TextAlignBtn,Path=Foreground}"/>
+                                    </Canvas>
+                                </Grid>
+                            </RadioButton.Content>
+                        </RadioButton>
+
                     </Grid>
                 </Border>
             </Grid>
 
 
-            <Grid Margin="0,18,0,0">
+            <!--<Grid Margin="0,18,0,0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="auto"/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <CompositeControl:SlidContent x:Name="layerThick" HorizontalAlignment="Right"/>
                 <CompositeControl:ColorContent Grid.Row="1" x:Name="cusColor"/>
-            </Grid>
+            </Grid>-->
 
 
 
 
-            <TextBlock x:Name="thicknessText" FontFamily="Segoe UI Semibold" FontWeight="SemiBold" FontSize="14" LineHeight="20" Margin="12,14,0,0" >Thickness</TextBlock>
-
+            <TextBlock x:Name="AlignText" FontFamily="Segoe UI Semibold" FontWeight="SemiBold" FontSize="14" LineHeight="20" Margin="12,14,0,0" >Thickness</TextBlock>
+            <Grid Width="150" HorizontalAlignment="Left" Margin="0,10,0,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
 
-            <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"></ColumnDefinition>
-                    <ColumnDefinition Width="auto"></ColumnDefinition>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
 
-                <Slider Name="ThicknessSlider" VerticalAlignment="Center" Margin="12,0,0,0" Width="148"  Minimum="0" Maximum="24" IsSelectionRangeEnabled="True" IsMoveToPointEnabled="True" 
-                    Style="{StaticResource RoundThumbSlider}"  TickFrequency="1" IsSnapToTickEnabled="True" >
-                    <Slider.Resources>
-                        <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="#477EDE" />
-                        <SolidColorBrush x:Key="{x:Static SystemColors.ControlDarkDarkBrushKey}" Color="#E2E3E6" />
-                    </Slider.Resources>
-                </Slider>
-
-
-                <Border Grid.Column="1" BorderBrush="#E2E3E6"  Width="80" Height="32" Margin="0,0,11,0"  BorderThickness="0">
-                    <Grid>
-                        <ComboBox Name="ThicknessBox" BorderThickness="1" Padding="10" Background="Transparent" BorderBrush="#FFE2E3E6"
-                                  MaxDropDownHeight="200">
-                            <ComboBox.ItemContainerStyle>
-                                <Style TargetType="{x:Type ComboBoxItem}">
-                                    <Setter Property="Padding" Value="10 0 0 0"/>
-                                </Style>
-                            </ComboBox.ItemContainerStyle>
-                            <ComboBoxItem Content="1" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                            <ComboBoxItem Content="3" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                            <ComboBoxItem Content="6" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                            <ComboBoxItem Content="9" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                            <ComboBoxItem Content="12" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                            <ComboBoxItem Content="15" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                            <ComboBoxItem Content="18" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                            <ComboBoxItem Content="21" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                            <ComboBoxItem Content="24" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
-                        </ComboBox>
-                        <TextBox Name="ThicknessText" Background="White" FontFamily="Segoe UI" FontSize="14"  Height="20" Margin="10,0,35,0" IsReadOnly="True"
-                             BorderThickness="0" VerticalAlignment="Center" TextAlignment="Left" >
-                        </TextBox>
-                    </Grid>
-                </Border>
+                <Button Grid.Row="0" Grid.Column="0" Width="32" Height="32"/>
+                <Button Grid.Row="0" Grid.Column="1" Width="32" Height="32"/>
+                <Button Grid.Row="0" Grid.Column="2" Width="32" Height="32"/>
+                <Button Grid.Row="0" Grid.Column="3" Width="32" Height="32"/>
+                <Button Grid.Row="1" Grid.Column="0" Margin="0,10,0,0" Width="32" Height="32"/>
+                <Button Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" Width="32" Height="32"/>
+                <Button Grid.Row="1" Grid.Column="2" Margin="0,10,0,0" Width="32" Height="32"/>
+                <Button Grid.Row="1" Grid.Column="3" Margin="0,10,0,0" Width="32" Height="32"/>
             </Grid>
 
-
-            <!--<StackPanel x:Name="PnlLineStyle" Orientation="Horizontal" Margin="0,20,0,0">
-                <cus:CustomIconToggleBtn x:Name="BtnSolidLine" Tag="Solid" Width="110" Height="32" Click="BtnLineStyle_Click"
-                                              Style="{StaticResource ToggleBtnViewModeStyle}">
-                    <Border BorderBrush="Black" BorderThickness="1" Padding="8,0,8,0" Width="108" Height="30">
-                        <Line X1="10" Y1="15" X2="260" Y2="15" Stroke="Black" StrokeThickness="2" />
-                    </Border>
-                </cus:CustomIconToggleBtn>
-                <cus:CustomIconToggleBtn x:Name="BtnDottedLine" Tag="Dotted" Width="110" Height="32" Click="BtnLineStyle_Click"
-                                              Style="{StaticResource ToggleBtnViewModeStyle}">
-                    <Border BorderBrush="Black" BorderThickness="1" Padding="8,0,8,0" Width="108" Height="30" >
-                        <Line X1="10" Y1="15" X2="260" Y2="15" Stroke="Black" StrokeThickness="2" StrokeDashArray="2"/>
-                    </Border>
-                </cus:CustomIconToggleBtn>
-            </StackPanel>-->
         </StackPanel>
     </Grid>
 </UserControl>

PDF Office/Views/Tools/TextEditToolContent.xaml

@@ -9,8 +9,8 @@
              xmlns:customControl ="clr-namespace:PDF_Office.CustomControl"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <StackPanel Orientation="Horizontal">
+    <Grid >
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
             <customControl:CustomIconToggleBtn x:Name="BtnAddText" Tag="SnapshotEdit" Style="{StaticResource ToggleBtnViewModeStyle}"  Foreground="Black" ContentStringFormat="156"
                                                Command="{Binding AddContentCommand}" CommandParameter="{Binding ElementName=BtnAddText,Path=Tag}"  
                                                >

PDF Office/Views/ViewContent.xaml

@@ -192,6 +192,12 @@
             prism:RegionManager.RegionName="{Binding ConverterBarContentRegionName}"
             Visibility="{Binding ConverterBarContentVisible}" />
 
+        <ContentControl
+            Name="TextEditContentBar"
+            Grid.Row="{Binding GridToolRow}"
+            prism:RegionManager.RegionName="{Binding TextEditContentRegionName}"
+            Visibility="{Binding TextEditToolContentVisible}" />
+
         <Grid Name="DocumentView" Grid.Row="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition