|
@@ -136,15 +136,8 @@ namespace PDF_Office.ViewModels.BOTA
|
|
List<TextSearchItem> pageTextList = new List<TextSearchItem>();
|
|
List<TextSearchItem> pageTextList = new List<TextSearchItem>();
|
|
foreach (var item in SearchItemList)
|
|
foreach (var item in SearchItemList)
|
|
{
|
|
{
|
|
- TextSearchItem textSearchItem = new TextSearchItem()
|
|
|
|
- {
|
|
|
|
- PageIndex = item.TextProperty.PageIndex,
|
|
|
|
- TextRect = item.TextProperty.TextRect,
|
|
|
|
- TextContent = item.TextProperty.TextContent,
|
|
|
|
- PageRotate = item.TextProperty.PageRotate
|
|
|
|
- };
|
|
|
|
- textSearchItem.PaintBrush = new SolidColorBrush(Color.FromArgb(0x99, 0xFF, 0xF7, 0x00));
|
|
|
|
- pageTextList.Add(textSearchItem);
|
|
|
|
|
|
+ item.TextProperty.SearchItem.PaintBrush = new SolidColorBrush(Color.FromArgb(0x99, 0xFF, 0xF7, 0x00));
|
|
|
|
+ pageTextList.Add(item.TextProperty.SearchItem);
|
|
}
|
|
}
|
|
PDFViewer.SetPageSelectText(pageTextList);
|
|
PDFViewer.SetPageSelectText(pageTextList);
|
|
});
|
|
});
|
|
@@ -166,6 +159,7 @@ namespace PDF_Office.ViewModels.BOTA
|
|
addItem.TextProperty.SearchWord = CurrentSearchText;
|
|
addItem.TextProperty.SearchWord = CurrentSearchText;
|
|
addItem.TextProperty.HighLightColor = Color.FromArgb(0x99, 0xFF, 0xF7, 0x00);
|
|
addItem.TextProperty.HighLightColor = Color.FromArgb(0x99, 0xFF, 0xF7, 0x00);
|
|
addItem.TextProperty.PageRotate = item.PageRotate;
|
|
addItem.TextProperty.PageRotate = item.PageRotate;
|
|
|
|
+ addItem.TextProperty.SearchItem = item;
|
|
SearchItemList.Add(addItem);
|
|
SearchItemList.Add(addItem);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -276,14 +270,11 @@ namespace PDF_Office.ViewModels.BOTA
|
|
if (currentItem != null && PDFViewer != null)
|
|
if (currentItem != null && PDFViewer != null)
|
|
{
|
|
{
|
|
List<TextSearchItem> pageTextList = new List<TextSearchItem>();
|
|
List<TextSearchItem> pageTextList = new List<TextSearchItem>();
|
|
- pageTextList.Add(new TextSearchItem()
|
|
|
|
- {
|
|
|
|
- PageIndex = currentItem.TextProperty.PageIndex,
|
|
|
|
- TextRect = currentItem.TextProperty.TextRect,
|
|
|
|
- TextContent = currentItem.TextProperty.TextContent,
|
|
|
|
- PageRotate = currentItem.TextProperty.PageRotate
|
|
|
|
- });
|
|
|
|
- PDFViewer.SetPageSelectText(pageTextList, new SolidColorBrush(Color.FromArgb(0x99, 0xFF, 0xF7, 0x00)));
|
|
|
|
|
|
+ currentItem.TextProperty.SearchItem.BorderBrush = new SolidColorBrush(Color.FromArgb(0xFF, 0x17, 0x70, 0xF4));
|
|
|
|
+ currentItem.TextProperty.SearchItem.Padding = 3;
|
|
|
|
+ currentItem.TextProperty.SearchItem.BorderThickness = 1;
|
|
|
|
+ pageTextList.Add(currentItem.TextProperty.SearchItem);
|
|
|
|
+ PDFViewer.HighLightSearchText(pageTextList);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|