|
@@ -63,7 +63,8 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
|
|
|
public Point OffsetParent;
|
|
|
public IEventAggregator eventAggregator;
|
|
|
private byte saveOpacity = 1;
|
|
|
- string Unicode = "";
|
|
|
+ private string Unicode = "";
|
|
|
+
|
|
|
public StickyNotePopup(IEventAggregator eventAggregator)
|
|
|
{
|
|
|
this.eventAggregator = eventAggregator;
|
|
@@ -136,10 +137,9 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
|
|
|
if (KeyEventsHelper.IsSingleKey(Key.Delete))
|
|
|
{
|
|
|
BtnDelete_Click(null, null);
|
|
|
-
|
|
|
}
|
|
|
- if (KeyEventsHelper.IsSingleKey(Key.Escape)) {
|
|
|
-
|
|
|
+ if (KeyEventsHelper.IsSingleKey(Key.Escape))
|
|
|
+ {
|
|
|
CloseText_MouseUp(this, null);
|
|
|
GetPDFViewer.PreviewMouseLeftButtonDown -= GetPDFViewer_LeftButtonDown;
|
|
|
}
|
|
@@ -274,9 +274,7 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
|
|
|
if (Closed != null)
|
|
|
{
|
|
|
Closed.Invoke(sender, EventArgs.Empty);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
protected override void OnMouseDown(MouseButtonEventArgs e)
|
|
@@ -404,6 +402,12 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
|
|
|
return StickyText;
|
|
|
}
|
|
|
|
|
|
+ public override void Close()
|
|
|
+ {
|
|
|
+ //base.Close();
|
|
|
+ RemoveFromLayer();
|
|
|
+ }
|
|
|
+
|
|
|
private void ListColor_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
|
|
{
|
|
|
var colorItem = ListColor.SelectedItem as ColorItem;
|
|
@@ -430,15 +434,13 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
|
|
|
private void BtnDelete_Click(object sender, RoutedEventArgs e)
|
|
|
{
|
|
|
if (GetPDFViewer != null)
|
|
|
- {
|
|
|
-
|
|
|
+ {
|
|
|
if (GetCurrentAnnot != null)
|
|
|
{
|
|
|
GetPDFViewer.RemovePageAnnot(GetCurrentAnnot.PageIndex, GetCurrentAnnot.AnnotIndex);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- // Closed.Invoke(sender, EventArgs.Empty);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Closed.Invoke(sender, EventArgs.Empty);
|
|
|
CloseText_MouseUp(this, null);
|
|
|
if (GetPDFViewer.ToolManager != null)
|
|
|
{
|