First pass at themes in Cappuccino.

Reviewed by me.
280north · Feb 1, 2009 · 492f4b6 · 492f4b6
1 parent 69cf9b3
commit 492f4b6
Show file tree

Hide file tree

Showing 45 changed files with 2,344 additions and 1,047 deletions.
diff --git a/AppKit/AppKit.steam b/AppKit/AppKit.steam
@@ -15,6 +15,7 @@
                 <string>CPTableColumn.j</string>
                 <string>CPTableView.j</string>
                 <!-- These get compiled into CGContext -->
+                <string>Themes</string>
                 <string>CoreGraphics/CGContextCanvas.j</string>
                 <string>CoreGraphics/CGContextVML.j</string>
             </array>
@@ -29,6 +30,7 @@
                 <string>CPOutlineView.j</string>
                 <string>CPTableColumn.j</string>
                 <string>CPTableView.j</string>
+                <string>Themes</string>
                 <!-- These get compiled into CGContext -->
                 <string>CoreGraphics/CGContextCanvas.j</string>
                 <string>CoreGraphics/CGContextVML.j</string>

diff --git a/AppKit/CPColor.j b/AppKit/CPColor.j
@@ -324,7 +324,7 @@ var _hueComponent        = 0,
     if (self)
     {
         _patternImage = anImage;
-        _cssString = "url(\"" + _patternImage._filename + "\")";
+        _cssString = "url(\"" + [_patternImage filename] + "\")";
     }
 
     return self;

diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
@@ -393,7 +393,7 @@ var CPControlBlackColor     = [CPColor blackColor];
     if ((_sendActionOn & (1 << type)) && isWithinFrame)
         [self sendAction:_action to:_target];
 
-    _trackingWasInFrame = isWithinFrame;
+    _trackingWasWithinFrame = isWithinFrame;
     _previousTrackingLocation = currentLocation;
 }
 

diff --git a/AppKit/CPImage.j b/AppKit/CPImage.j
@@ -338,6 +338,11 @@ function CPImageInBundle(aFilename, aSize, aBundle)
     return self;
 }
 
+- (CPString)filename
+{
+    return @"";
+}
+
 - (CPArray)imageSlices
 {
     return _imageSlices;
@@ -402,6 +407,11 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
     return self;
 }
 
+- (CPString)filename
+{
+    return @"";
+}
+
 - (CPArray)imageSlices
 {
     return _imageSlices;