BOTA- 注释，MVP不处理高亮/下划线/删除线的样式，只显示文字

PDF Office/ViewModels/BOTA/AnnotationContentViewModel.cs

@@ -7,7 +7,6 @@ using ComPDFKitViewer.AnnotEvent;
 using ComPDFKitViewer.PdfViewer;
 using DryIoc;
 using ImTools;
-using Microsoft.Office.Interop.Excel;
 using Microsoft.Office.Interop.PowerPoint;
 using Microsoft.Office.Interop.Word;
 using PDF_Office.CustomControl;
@@ -733,7 +732,7 @@ namespace PDF_Office.ViewModels.BOTA
                     {
                         DialogParameters value = new DialogParameters();
                         value.Add(ParameterNames.Annotation, args);
-                        dialogs.ShowDialog(DialogNames.AddAnnotationDialog, value, async e =>
+                        dialogs.ShowDialog(DialogNames.AddAnnotationDialog, value, e =>
                         {
                             if (e.Result == ButtonResult.OK && e.Parameters != null)
                             {
@@ -746,6 +745,19 @@ namespace PDF_Office.ViewModels.BOTA
                             }
                         });
                     }
+                    //else if (args.EventType == AnnotArgsType.AnnotFreeText)
+                    //{
+                    //    StackPanel stackPanel = CommonHelper.FindVisualChild<StackPanel>(listBoxItem);
+                    //    TextBox textBox = CommonHelper.FindVisualChild<TextBox>(stackPanel);
+                    //    TextBlock textBlock = CommonHelper.FindVisualChild<TextBlock>(stackPanel);
+                    //    textBlock.Visibility = Visibility.Collapsed;
+                    //    textBox.Visibility = Visibility.Visible;
+                    //    textBox.Dispatcher.BeginInvoke(new Action(() =>
+                    //    {
+                    //        textBox.Focus();
+                    //        textBox.SelectAll();
+                    //    }));
+                    //}
                 }
             }
         }

PDF Office/ViewModels/BOTA/BookmarkContentViewModel.cs

@@ -420,20 +420,7 @@ namespace PDF_Office.ViewModels.BOTA
 
         private ListViewItem selectListViewItem = null;
 
-        private async Task<ListViewItem> GetListViewItem(System.Windows.Controls.ListView listView, CPDFBookmark cPDFBookmark)
-        {
-            ListViewItem myListBoxItem = (ListViewItem)(listView.ItemContainerGenerator.ContainerFromItem(cPDFBookmark));
-            if (myListBoxItem == null)
-            {
-                await Task.Delay(3);
-                myListBoxItem = (ListViewItem)(listView.ItemContainerGenerator.ContainerFromItem(cPDFBookmark));
-            }
-            if (myListBoxItem != null)
-            {
-                selectListViewItem = myListBoxItem;
-            }
-            return myListBoxItem;
-        }
+
 
         public void OnNavigatedTo(NavigationContext navigationContext)
         {

PDF Office/Views/BOTA/AnnotationListItem.xaml.cs

@@ -61,11 +61,11 @@ namespace PDF_Office.Views.BOTA
                 case AnnotArgsType.AnnotHighlight:
                     BtnHighlight.Visibility = Visibility.Visible;
                     PathHighlight.Background = new SolidColorBrush((data as TextHighlightAnnotArgs).Color);
-                    //TxbContext.Text = data.Content;
-                    if (!string.IsNullOrEmpty(TxbMarkupContent.Text))
-                    {
-                        TxbMarkupContent.Background = new SolidColorBrush((data as TextHighlightAnnotArgs).Color);
-                    }
+                    //BOTA - 注释，MVP不处理高亮 / 下划线 / 删除线的样式，只显示文字
+                    //if (!string.IsNullOrEmpty(TxbMarkupContent.Text))
+                    //{
+                    //    TxbMarkupContent.Background = new SolidColorBrush((data as TextHighlightAnnotArgs).Color);
+                    //}
 
                     break;
 
@@ -140,18 +140,18 @@ namespace PDF_Office.Views.BOTA
 
                     #region to do
 
-                    TextDecoration myStrikeout = new TextDecoration();
-                    Pen myPen2 = new Pen();
-                    myPen2.Brush = new SolidColorBrush((data as TextStrikeoutAnnotArgs).Color);
-                    myPen2.Brush.Opacity = 0.8;
-                    myPen2.Thickness = 2;
-                    myStrikeout.Pen = myPen2;
-                    myStrikeout.PenOffset = -4;
-                    myStrikeout.PenThicknessUnit = TextDecorationUnit.FontRecommended;
-                    TextDecorationCollection myCollection2 = new TextDecorationCollection();
-                    myCollection2.Add(myStrikeout);
-                    //因为波浪线无法实现 暂时只显示文字 不显示下划线，删除线等
-                    TxbMarkupContent.TextDecorations = myCollection2;
+                    //TextDecoration myStrikeout = new TextDecoration();
+                    //Pen myPen2 = new Pen();
+                    //myPen2.Brush = new SolidColorBrush((data as TextStrikeoutAnnotArgs).Color);
+                    //myPen2.Brush.Opacity = 0.8;
+                    //myPen2.Thickness = 2;
+                    //myStrikeout.Pen = myPen2;
+                    //myStrikeout.PenOffset = -4;
+                    //myStrikeout.PenThicknessUnit = TextDecorationUnit.FontRecommended;
+                    //TextDecorationCollection myCollection2 = new TextDecorationCollection();
+                    //myCollection2.Add(myStrikeout);
+                    ////因为波浪线无法实现 暂时只显示文字 不显示下划线，删除线等
+                    //TxbMarkupContent.TextDecorations = myCollection2;
 
                     #endregion to do
 
@@ -168,16 +168,16 @@ namespace PDF_Office.Views.BOTA
 
                     #region TO DO
 
-                    TextDecoration myUnderline = new TextDecoration();
-                    Pen myPen1 = new Pen();
-                    myPen1.Brush = new SolidColorBrush((data as TextUnderlineAnnotArgs).Color);
-                    myPen1.Brush.Opacity = 0.8;
-                    myPen1.Thickness = 2;
-                    myUnderline.Pen = myPen1;
-                    myUnderline.PenThicknessUnit = TextDecorationUnit.FontRecommended;
-                    TextDecorationCollection myCollection1 = new TextDecorationCollection();
-                    myCollection1.Add(myUnderline);
-                    TxbMarkupContent.TextDecorations = myCollection1;
+                    //TextDecoration myUnderline = new TextDecoration();
+                    //Pen myPen1 = new Pen();
+                    //myPen1.Brush = new SolidColorBrush((data as TextUnderlineAnnotArgs).Color);
+                    //myPen1.Brush.Opacity = 0.8;
+                    //myPen1.Thickness = 2;
+                    //myUnderline.Pen = myPen1;
+                    //myUnderline.PenThicknessUnit = TextDecorationUnit.FontRecommended;
+                    //TextDecorationCollection myCollection1 = new TextDecorationCollection();
+                    //myCollection1.Add(myUnderline);
+                    //TxbMarkupContent.TextDecorations = myCollection1;
 
                     #endregion TO DO
 
@@ -249,5 +249,7 @@ namespace PDF_Office.Views.BOTA
                     break;
             }
         }
+
+
     }
 }