|
@@ -373,7 +373,7 @@ namespace PDF_Master.ViewModels.Tools
|
|
PropertyPanel.annotlists = e.AnnotItemsList;
|
|
PropertyPanel.annotlists = e.AnnotItemsList;
|
|
}
|
|
}
|
|
//0515 调整单击 便签弹窗
|
|
//0515 调整单击 便签弹窗
|
|
- if (e.AnnotItemsList.Count == 1 && e.IsMouseRightActive==false)
|
|
|
|
|
|
+ if (e.AnnotItemsList.Count == 1 && e.IsMouseRightActive == false)
|
|
{
|
|
{
|
|
if (e.AnnotItemsList[0] is StickyAnnotArgs stickyAnnotArgs)
|
|
if (e.AnnotItemsList[0] is StickyAnnotArgs stickyAnnotArgs)
|
|
{
|
|
{
|
|
@@ -791,7 +791,22 @@ namespace PDF_Master.ViewModels.Tools
|
|
else
|
|
else
|
|
{
|
|
{
|
|
GetSelectedAnnots(e);
|
|
GetSelectedAnnots(e);
|
|
- ShowPropertyPanel(true);
|
|
|
|
|
|
+ if (string.IsNullOrEmpty(StrAnnotToolChecked) == true)
|
|
|
|
+ {
|
|
|
|
+ var count = e.AnnotItemsList.FindAll(r => r.EventType == AnnotArgsType.AnnotStamp).Count;
|
|
|
|
+ if (count > 0)
|
|
|
|
+ {
|
|
|
|
+ ShowPropertyPanel(false);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ ShowPropertyPanel(true);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ ShowPropertyPanel(true);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|