Revision: 14818
http://sourceforge.net/p/skim-app/code/14818
Author: hofman
Date: 2024-12-11 10:04:37 +0000 (Wed, 11 Dec 2024)
Log Message:
-----------
more compact code to update color panel
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2024-12-11 00:11:36 UTC (rev 14817)
+++ trunk/SKMainWindowController.m 2024-12-11 10:04:37 UTC (rev 14818)
@@ -2736,18 +2736,17 @@
// update the various panels if necessary
if ([[self window] isMainWindow] && [note isEqual:[pdfView
currentAnnotation]]) {
if (mwcFlags.updatingColor == 0) {
- if ([keyPath isEqualToString:SKNPDFAnnotationColorKey] &&
([note hasInteriorColor] == NO || [colorAccessoryView state] ==
NSControlStateValueOff) && ([note isText] == NO || [textColorAccessoryView
state] == NSControlStateValueOff)) {
+ NSColor *color = nil;
+ if ([keyPath isEqualToString:SKNPDFAnnotationColorKey] &&
([note hasInteriorColor] == NO || [colorAccessoryView state] ==
NSControlStateValueOff) && ([note isText] == NO || [textColorAccessoryView
state] == NSControlStateValueOff))
+ color = [note color] ?: [NSColor clearColor];
+ else if ([keyPath
isEqualToString:SKNPDFAnnotationInteriorColorKey] && [colorAccessoryView state]
== NSControlStateValueOn)
+ color = [note interiorColor] ?: [NSColor clearColor];
+ else if ([keyPath
isEqualToString:SKNPDFAnnotationFontColorKey] && [textColorAccessoryView state]
== NSControlStateValueOn)
+ color = [note fontColor] ?: [NSColor blackColor];
+ if (color) {
mwcFlags.updatingColor = 1;
- [[NSColorPanel sharedColorPanel] setColor:[note color]
?: [NSColor clearColor]];
+ [[NSColorPanel sharedColorPanel] setColor:color];
mwcFlags.updatingColor = 0;
- } else if ([keyPath
isEqualToString:SKNPDFAnnotationInteriorColorKey] && [colorAccessoryView state]
== NSControlStateValueOn) {
- mwcFlags.updatingColor = 1;
- [[NSColorPanel sharedColorPanel] setColor:[note
interiorColor] ?: [NSColor clearColor]];
- mwcFlags.updatingColor = 0;
- } else if ([keyPath
isEqualToString:SKNPDFAnnotationFontColorKey] && [textColorAccessoryView state]
== NSControlStateValueOn) {
- mwcFlags.updatingColor = 1;
- [[NSColorPanel sharedColorPanel] setColor:[note
fontColor] ?: [NSColor blackColor]];
- mwcFlags.updatingColor = 0;
}
}
if (mwcFlags.updatingFont == 0 && ([keyPath
isEqualToString:SKNPDFAnnotationFontKey])) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
