Browse Source

【综合】【偏好设置】设置逻辑错误,需参考Pro调整(已修复)

tangchao 10 months ago
parent
commit
bf53779a88

+ 9 - 0
PDF Office/PDF Master/Class/Common/LineInspector/KMLineInspector.swift

@@ -88,6 +88,7 @@ enum KMLineChangeAction: Int {
             if (newValue != self._style) {
                 self._style = newValue
                 self.lineWell?.style = CPDFBorderStyle(rawValue: newValue) ?? .solid
+                self.styleButton.selectedSegment = self.style
                 
                 self._notifyChangeAction(.style)
             }
@@ -133,6 +134,14 @@ enum KMLineChangeAction: Int {
                 self._dashPattern = newValue
                 
                 self.lineWell?.dashPattern = newValue as NSArray
+                self.dashPatternField.stringValue = "\(self.dashPattern.count)"
+                
+                self._notifyChangeAction(.dashPattern)
+            } else {
+                self._dashPattern = []
+                self.lineWell?.dashPattern = newValue as NSArray
+                self.dashPatternField.stringValue = "\(self.dashPattern.count)"
+                
                 self._notifyChangeAction(.dashPattern)
             }
         }

+ 7 - 4
PDF Office/PDF Master/Class/Preference/View/KMLineWell.swift

@@ -279,7 +279,10 @@ class KMLineWell: NSControl {
             self.needsDisplay = true
 //            NSUInteger modifiers = [theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
             var modifiers = event.modifierFlags
-            modifiers.insert(.deviceIndependentFlagsMask)
+//            modifiers.insert(.deviceIndependentFlagsMask)
+            if modifiers.contains(.deviceIndependentFlagsMask) {
+                modifiers.remove(.deviceIndependentFlagsMask)
+            }
             var keepOn = true
             var _event: NSEvent = event
             while (keepOn) {
@@ -309,7 +312,7 @@ class KMLineWell: NSControl {
 //                            [self dragImage:[self dragImage] at:bounds.origin offset:NSZeroSize event:theEvent pasteboard:pboard source:self slideBack:YES];
                             
                             keepOn = false
-                            break;
+                            break
 //                        }
                     case .leftMouseUp:
                         if (self.isActive) {
@@ -319,9 +322,9 @@ class KMLineWell: NSControl {
                             self._activate(modifiers.contains(.shift) == false)
                         }
                         keepOn = false
-                        break;
+                        break
                     default:
-                        break;
+                        break
                     }
                 }
             }