Revision: 5318
http://skim-app.svn.sourceforge.net/skim-app/?rev=5318&view=rev
Author: hofman
Date: 2009-04-17 22:03:13 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
source list highlight colors depend on the control tint, so do the same in the
tables for consistency
Modified Paths:
--------------
trunk/SKThumbnailTableView.m
trunk/SKTocOutlineView.m
Modified: trunk/SKThumbnailTableView.m
===================================================================
--- trunk/SKThumbnailTableView.m 2009-04-17 09:58:07 UTC (rev 5317)
+++ trunk/SKThumbnailTableView.m 2009-04-17 22:03:13 UTC (rev 5318)
@@ -100,12 +100,21 @@
BOOL supportsSourceList = [self
respondsToSelector:@selector(setSelectionHighlightStyle:)];
if (supportsSourceList) {
- if ([[self window] isMainWindow] == NO)
- color = [NSColor colorWithDeviceRed:40606.0/65535.0
green:40606.0/65535.0 blue:40606.0/65535.0 alpha:1.0];
- else if ([[self window] isKeyWindow] && [[self window] firstResponder]
== self)
- color = [NSColor colorWithDeviceRed:14135.0/65535.0
green:29298.0/65535.0 blue:48830.0/65535.0 alpha:1.0];
- else
- color = [NSColor colorWithDeviceRed:34695.0/65535.0
green:39064.0/65535.0 blue:48316.0/65535.0 alpha:1.0];
+ if ([NSColor currentControlTint] == NSGraphiteControlTint) {
+ if ([[self window] isMainWindow] == NO)
+ color = [NSColor colorWithDeviceRed:40606.0/65535.0
green:40606.0/65535.0 blue:40606.0/65535.0 alpha:1.0];
+ else if ([[self window] isKeyWindow] && [[self window]
firstResponder] == self)
+ color = [NSColor colorWithDeviceRed:24672.0/65535.0
green:29812.0/65535.0 blue:35466.0/65535.0 alpha:1.0];
+ else
+ color = [NSColor colorWithDeviceRed:37779.0/65535.0
green:41634.0/65535.0 blue:45489.0/65535.0 alpha:1.0];
+ } else {
+ if ([[self window] isMainWindow] == NO)
+ color = [NSColor colorWithDeviceRed:40606.0/65535.0
green:40606.0/65535.0 blue:40606.0/65535.0 alpha:1.0];
+ else if ([[self window] isKeyWindow] && [[self window]
firstResponder] == self)
+ color = [NSColor colorWithDeviceRed:14135.0/65535.0
green:29298.0/65535.0 blue:48830.0/65535.0 alpha:1.0];
+ else
+ color = [NSColor colorWithDeviceRed:34695.0/65535.0
green:39064.0/65535.0 blue:48316.0/65535.0 alpha:1.0];
+ }
} else {
if ([[self window] isMainWindow] && [[self window] firstResponder] ==
self)
color = [NSColor alternateSelectedControlColor];
Modified: trunk/SKTocOutlineView.m
===================================================================
--- trunk/SKTocOutlineView.m 2009-04-17 09:58:07 UTC (rev 5317)
+++ trunk/SKTocOutlineView.m 2009-04-17 22:03:13 UTC (rev 5318)
@@ -80,12 +80,21 @@
BOOL supportsSourceList = [self
respondsToSelector:@selector(setSelectionHighlightStyle:)];
if (supportsSourceList) {
- if ([[self window] isMainWindow] == NO)
- color = [NSColor colorWithDeviceRed:40606.0/65535.0
green:40606.0/65535.0 blue:40606.0/65535.0 alpha:1.0];
- else if ([[self window] isKeyWindow] && [[self window] firstResponder]
== self)
- color = [NSColor colorWithDeviceRed:14135.0/65535.0
green:29298.0/65535.0 blue:48830.0/65535.0 alpha:1.0];
- else
- color = [NSColor colorWithDeviceRed:34695.0/65535.0
green:39064.0/65535.0 blue:48316.0/65535.0 alpha:1.0];
+ if ([NSColor currentControlTint] == NSGraphiteControlTint) {
+ if ([[self window] isMainWindow] == NO)
+ color = [NSColor colorWithDeviceRed:40606.0/65535.0
green:40606.0/65535.0 blue:40606.0/65535.0 alpha:1.0];
+ else if ([[self window] isKeyWindow] && [[self window]
firstResponder] == self)
+ color = [NSColor colorWithDeviceRed:24672.0/65535.0
green:29812.0/65535.0 blue:35466.0/65535.0 alpha:1.0];
+ else
+ color = [NSColor colorWithDeviceRed:37779.0/65535.0
green:41634.0/65535.0 blue:45489.0/65535.0 alpha:1.0];
+ } else {
+ if ([[self window] isMainWindow] == NO)
+ color = [NSColor colorWithDeviceRed:40606.0/65535.0
green:40606.0/65535.0 blue:40606.0/65535.0 alpha:1.0];
+ else if ([[self window] isKeyWindow] && [[self window]
firstResponder] == self)
+ color = [NSColor colorWithDeviceRed:14135.0/65535.0
green:29298.0/65535.0 blue:48830.0/65535.0 alpha:1.0];
+ else
+ color = [NSColor colorWithDeviceRed:34695.0/65535.0
green:39064.0/65535.0 blue:48316.0/65535.0 alpha:1.0];
+ }
} else {
if ([[self window] isKeyWindow] && [[self window] firstResponder] ==
self)
color = [NSColor alternateSelectedControlColor];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit