Revision: 5320
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5320&view=rev
Author:   hofman
Date:     2009-04-18 17:31:06 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
define static c-arrays for source list highlight colors

Modified Paths:
--------------
    trunk/SKThumbnailTableView.m
    trunk/SKTocOutlineView.m

Modified: trunk/SKThumbnailTableView.m
===================================================================
--- trunk/SKThumbnailTableView.m        2009-04-18 09:37:26 UTC (rev 5319)
+++ trunk/SKThumbnailTableView.m        2009-04-18 17:31:06 UTC (rev 5320)
@@ -93,6 +93,13 @@
     [super dealloc];
 }
 
+static CGFloat keyColorBlue[3]          = {14135.0/65535.0, 29298.0/65535.0, 
48830.0/65535.0};
+static CGFloat mainColorBlue[3]         = {37779.0/65535.0, 41634.0/65535.0, 
45489.0/65535.0};
+static CGFloat disabledColorBlue[3]     = {40606.0/65535.0, 40606.0/65535.0, 
40606.0/65535.0};
+static CGFloat keyColorGraphite[3]      = {24672.0/65535.0, 29812.0/65535.0, 
35466.0/65535.0};
+static CGFloat mainColorGraphite[3]     = {37779.0/65535.0, 41634.0/65535.0, 
45489.0/65535.0};
+static CGFloat disabledColorGraphite[3] = {40606.0/65535.0, 40606.0/65535.0, 
40606.0/65535.0};
+
 - (void)highlightSelectionInClipRect:(NSRect)clipRect {
     NSColor *color;
     NSInteger row;
@@ -100,21 +107,15 @@
     BOOL supportsSourceList = [self 
respondsToSelector:@selector(setSelectionHighlightStyle:)];
     
     if (supportsSourceList) {
-        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];
-        }
+        CGFloat *rgb;
+        BOOL isGraphite = [NSColor currentControlTint] == 
NSGraphiteControlTint;
+        if ([[self window] isMainWindow] == NO)
+            rgb = isGraphite ? disabledColorGraphite : disabledColorBlue;
+        else if ([[self window] isKeyWindow] && [[self window] firstResponder] 
== self)
+            rgb = isGraphite ? keyColorGraphite : keyColorBlue;
+        else
+            rgb = isGraphite ? mainColorGraphite : mainColorBlue;
+        color = [NSColor colorWithDeviceRed:rgb[0] green:rgb[1] blue:rgb[2] 
alpha:1.0];
     } else {
         if ([[self window] isMainWindow] && [[self window] firstResponder] == 
self)
             color = [NSColor alternateSelectedControlColor];

Modified: trunk/SKTocOutlineView.m
===================================================================
--- trunk/SKTocOutlineView.m    2009-04-18 09:37:26 UTC (rev 5319)
+++ trunk/SKTocOutlineView.m    2009-04-18 17:31:06 UTC (rev 5320)
@@ -73,6 +73,13 @@
     [super dealloc];
 }
 
+static CGFloat keyColorBlue[3]          = {14135.0/65535.0, 29298.0/65535.0, 
48830.0/65535.0};
+static CGFloat mainColorBlue[3]         = {37779.0/65535.0, 41634.0/65535.0, 
45489.0/65535.0};
+static CGFloat disabledColorBlue[3]     = {40606.0/65535.0, 40606.0/65535.0, 
40606.0/65535.0};
+static CGFloat keyColorGraphite[3]      = {24672.0/65535.0, 29812.0/65535.0, 
35466.0/65535.0};
+static CGFloat mainColorGraphite[3]     = {37779.0/65535.0, 41634.0/65535.0, 
45489.0/65535.0};
+static CGFloat disabledColorGraphite[3] = {40606.0/65535.0, 40606.0/65535.0, 
40606.0/65535.0};
+
 - (void)highlightSelectionInClipRect:(NSRect)clipRect {
     NSColor *color;
     NSInteger row;
@@ -80,21 +87,15 @@
     BOOL supportsSourceList = [self 
respondsToSelector:@selector(setSelectionHighlightStyle:)];
     
     if (supportsSourceList) {
-        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];
-        }
+        CGFloat *rgb;
+        BOOL isGraphite = [NSColor currentControlTint] == 
NSGraphiteControlTint;
+        if ([[self window] isMainWindow] == NO)
+            rgb = isGraphite ? disabledColorGraphite : disabledColorBlue;
+        else if ([[self window] isKeyWindow] && [[self window] firstResponder] 
== self)
+            rgb = isGraphite ? keyColorGraphite : keyColorBlue;
+        else
+            rgb = isGraphite ? mainColorGraphite : mainColorBlue;
+        color = [NSColor colorWithDeviceRed:rgb[0] green:rgb[1] blue:rgb[2] 
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

Reply via email to