|
@@ -1329,7 +1329,7 @@ namespace PDF_Master.ViewModels.Tools
|
|
if (stampAnnotArgs != null)
|
|
if (stampAnnotArgs != null)
|
|
stampAnnotArgsList.Add(stampAnnotArgs);
|
|
stampAnnotArgsList.Add(stampAnnotArgs);
|
|
|
|
|
|
- if (string.IsNullOrEmpty(StrAnnotToolChecked) || StrAnnotToolChecked != "Stamp")
|
|
|
|
|
|
+ if (string.IsNullOrEmpty(StrAnnotToolChecked))
|
|
{
|
|
{
|
|
if (IsNoSelectMenu)
|
|
if (IsNoSelectMenu)
|
|
{
|
|
{
|
|
@@ -1337,8 +1337,16 @@ namespace PDF_Master.ViewModels.Tools
|
|
return stampAnnotArgs;
|
|
return stampAnnotArgs;
|
|
}
|
|
}
|
|
viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
|
|
viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
|
|
|
|
+
|
|
return stampAnnotArgs;
|
|
return stampAnnotArgs;
|
|
}
|
|
}
|
|
|
|
+ //已选中注释工具的前提下,选中页面已经添加的图章注释时,右侧属性面板显示空状态(不自动收起)
|
|
|
|
+ if (StrAnnotToolChecked != "Stamp" && string.IsNullOrEmpty(StrAnnotToolChecked)==false)
|
|
|
|
+ {
|
|
|
|
+ viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
|
|
|
|
+ ShowPropertyPanel(true);
|
|
|
|
+ return stampAnnotArgs;
|
|
|
|
+ }
|
|
AddToPropertyPanel("StampAnnotProperty", null, stampAnnotArgsList);
|
|
AddToPropertyPanel("StampAnnotProperty", null, stampAnnotArgsList);
|
|
return stampAnnotArgs;
|
|
return stampAnnotArgs;
|
|
}
|
|
}
|