Revision: 14817
http://sourceforge.net/p/skim-app/code/14817
Author: hofman
Date: 2024-12-11 00:11:36 +0000 (Wed, 11 Dec 2024)
Log Message:
-----------
Update color panel with interior or font color when that is selected
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2024-12-10 23:05:09 UTC (rev 14816)
+++ trunk/SKMainWindowController.m 2024-12-11 00:11:36 UTC (rev 14817)
@@ -2735,10 +2735,20 @@
// update the various panels if necessary
if ([[self window] isMainWindow] && [note isEqual:[pdfView
currentAnnotation]]) {
- if (mwcFlags.updatingColor == 0 && ([keyPath
isEqualToString:SKNPDFAnnotationColorKey] || [keyPath
isEqualToString:SKNPDFAnnotationInteriorColorKey])) {
- mwcFlags.updatingColor = 1;
- [[NSColorPanel sharedColorPanel] setColor:[note color]];
- mwcFlags.updatingColor = 0;
+ if (mwcFlags.updatingColor == 0) {
+ if ([keyPath isEqualToString:SKNPDFAnnotationColorKey] &&
([note hasInteriorColor] == NO || [colorAccessoryView state] ==
NSControlStateValueOff) && ([note isText] == NO || [textColorAccessoryView
state] == NSControlStateValueOff)) {
+ mwcFlags.updatingColor = 1;
+ [[NSColorPanel sharedColorPanel] setColor:[note color]
?: [NSColor clearColor]];
+ 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])) {
mwcFlags.updatingFont = 1;
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
