Pārlūkot izejas kodu

便签更改颜色修复

liyijie 1 gadu atpakaļ
vecāks
revīzija
360b910823

+ 3 - 1
PDF Office/ViewModels/PropertyPanel/AnnotPanel/StickyNotePropertyViewModel.cs

@@ -97,7 +97,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
         public DelegateCommand<object> SelectedOpacityValueCommand { get; set; }
 
         private IEventAggregator eventAggregator;
-        private string Unicode = "";
+        public string Unicode = "";
 
         public StickyNotePropertyViewModel(IEventAggregator eventAggregator)
         {
@@ -119,6 +119,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
         private void SetStickyNoteColor(StickyNoteColorUnicode stickyNoteColorUnicode)
         {
             SharpColor = stickyNoteColorUnicode.brush;
+            PropertyPanel.UpdateAnnotAAttrib(AnnotAttrib.Color, (SharpColor as SolidColorBrush).Color);
         }
 
         private void InitColorItems()
@@ -214,6 +215,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             navigationContext.Parameters.TryGetValue<AnnotTransfer>(ParameterNames.PropertyPanelContentViewModel, out PropertyPanel);
             if (PropertyPanel != null)
             {
+                
                 AnnotEvent = PropertyPanel.AnnotEvent;
                 Annot = PropertyPanel.annot;
                 IsMultiSelected = PropertyPanel.IsMultiSelected;

+ 2 - 1
PDF Office/Views/PropertyPanel/AnnotPanel/StickyNotePopup.xaml.cs

@@ -68,7 +68,7 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
         public StickyNotePopup(IEventAggregator eventAggregator)
         {
             this.eventAggregator = eventAggregator;
-            Unicode = App.mainWindowViewModel.SelectedItem.Unicode;
+            
             InitializeComponent();
             AddHandler(MouseUpEvent, new MouseButtonEventHandler(StickyPopupControl_MouseUp), true);
             ContentText.AddHandler(MouseDownEvent, new MouseButtonEventHandler(StickyPopupControl_MouseDown), true);
@@ -124,6 +124,7 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
 
         private void StickyPopupControl_Loaded(object sender, RoutedEventArgs e)
         {
+            Unicode = App.mainWindowViewModel.SelectedItem.Unicode;
             ContentText.Focus();
             ContentText.CaretIndex = ContentText.Text.Length;
             LoadedColor();