Author: ericwa
Date: Mon Mar 24 22:38:03 2014
New Revision: 10634
URL: http://svn.gna.org/viewcvs/etoile?rev=10634&view=rev
Log:
graph renderer: use a different color for the undo and history graphs
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.h
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.m
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m
Modified: trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.h
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.h?rev=10634&r1=10633&r2=10634&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.h
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.h
Mon Mar 24 22:38:03 2014
@@ -10,6 +10,7 @@
@protocol EWGraphRendererDelegate <NSObject>
- (NSArray *) allOrderedNodesToDisplayForTrack: (id<COTrack>)aTrack;
+- (NSColor *) colorForNode: (id<COTrack>)aTrack isCurrentOrAncestorOfCurrent:
(BOOL)current;
@end
@interface EWGraphRenderer : NSObject
Modified: trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.m?rev=10634&r1=10633&r2=10634&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.m
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWGraphRenderer.m
Mon Mar 24 22:38:03 2014
@@ -354,14 +354,8 @@
- (NSColor *)colorForUUID: (ETUUID *)commit
{
- if ([currentUUIDAndAncestors containsObject: commit])
- {
- return [NSColor colorWithCalibratedRed: 0 green: 0.2 blue: 0.5
alpha: 1.0];
- }
- else
- {
- return [NSColor colorWithCalibratedRed: 0.7 green: 0.7 blue:
0.7 alpha: 1.0];
- }
+ return [self.delegate colorForNode: revisionInfoForUUID[commit]
+ isCurrentOrAncestorOfCurrent: [currentUUIDAndAncestors
containsObject: commit]];
}
- (void) drawRevisionAtIndex: (NSUInteger)index inRect: (NSRect)aRect
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m?rev=10634&r1=10633&r2=10634&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
Mon Mar 24 22:38:03 2014
@@ -258,4 +258,16 @@
return revisions;
}
+- (NSColor *) colorForNode: (id<COTrack>)aTrack isCurrentOrAncestorOfCurrent:
(BOOL)current
+{
+ if (current)
+ {
+ return [NSColor colorWithCalibratedRed: 0.5 green: 0.0 blue:
0.2 alpha: 1.0];
+ }
+ else
+ {
+ return [NSColor colorWithCalibratedRed: 0.7 green: 0.7 blue:
0.7 alpha: 1.0];
+ }
+}
+
@end
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m?rev=10634&r1=10633&r2=10634&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m
Mon Mar 24 22:38:03 2014
@@ -276,4 +276,16 @@
return sortTrackNodes(allCommands);
}
+- (NSColor *) colorForNode: (id<COTrack>)aTrack isCurrentOrAncestorOfCurrent:
(BOOL)current
+{
+ if (current)
+ {
+ return [NSColor colorWithCalibratedRed: 0 green: 0.2 blue: 0.5
alpha: 1.0];
+ }
+ else
+ {
+ return [NSColor colorWithCalibratedRed: 0.7 green: 0.7 blue:
0.7 alpha: 1.0];
+ }
+}
+
@end
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
