Changeset 111 for Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Summary_View/CSummaryTable.cp

Timestamp:

10/28/07 23:29:14 (1 year ago)

Author:

daboo

Message:

Tweak the look of calendar events.

Files:

• Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Summary_View/CSummaryTable.cp (modified) (9 diffs)

Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Summary_View/CSummaryTable.cp

@@ -42 +42 @@
 const uint32_t cLinkHeight = 16;
 
+const float body_transparency = 0.75;
+const float line_transparency = 1.0;
+const float text_transparency = 0.9;
+
 // ---------------------------------------------------------------------------
 //      CSummaryTable                                                                                                             [public]
@@ -217 +221 @@
         float blue = CGUtils::GetCGBlue(event->mColour);
         if (CellIsSelected(inCell) && mDrawSelection)
-                CGUtils::UnflattenColours(red, green, blue);
+                ;
+        else
+                CGUtils::LightenColours(red, green, blue);
 
         if (!link)
         {
-                ::CGContextSetRGBFillColor(inContext, red, green, blue, 1.0);
+                ::CGContextSetRGBFillColor(inContext, red, green, blue, (CellIsSelected(inCell) && mDrawSelection) ? 1.0 : body_transparency);
                 ::CGContextFillRect(inContext, adjustedRect);
         }
@@ -233 +239 @@
                 ::CGContextSetGrayStrokeColor(inContext, 0.5, 1.0);
                 ::CGContextStrokePath(inContext);
-                ::CGContextClosePath(inContext);
+                //::CGContextClosePath(inContext);
 
                 // Right-side only for last column
@@ -243 +249 @@
                         ::CGContextSetGrayStrokeColor(inContext, 0.5, 1.0);
                         ::CGContextStrokePath(inContext);
-                        ::CGContextClosePath(inContext);
+                        //::CGContextClosePath(inContext);
                 }
 
@@ -253 +259 @@
                         ::CGContextSetGrayStrokeColor(inContext, 0.5, 1.0);
                         ::CGContextStrokePath(inContext);
-                        ::CGContextClosePath(inContext);
+                        //::CGContextClosePath(inContext);
                 }
 
@@ -264 +270 @@
                         ::CGContextSetGrayStrokeColor(inContext, 0.5, 1.0);
                         ::CGContextStrokePath(inContext);
-                        ::CGContextClosePath(inContext);
+                        //::CGContextClosePath(inContext);
                 }
         }
@@ -301 +307 @@
                 ::CGContextSetGrayStrokeColor(inContext, 0.0, 1.0);
                 ::CGContextStrokePath(inContext);
-                ::CGContextClosePath(inContext);
+                //::CGContextClosePath(inContext);
                 
         }
@@ -330 +336 @@
         ::CGContextSetShouldAntialias(inContext, true);
 
-        ::CGContextSetGrayFillColor(inContext, 0.0, 1.0);
+        ::CGContextSetGrayFillColor(inContext, (CellIsSelected(inCell) && mDrawSelection) ? 1.0 : 0.0, 1.0);
         if (draw_txt)
         {
                 Rect box = inLocalQDRect;
-                box.bottom -= mTextDescent;
+                box.bottom = box.bottom - mTextDescent - 2;
                 ::DrawClippedStringUTF8(inContext, text, box, eDrawString_Left);
         }
@@ -347 +353 @@
                 ::CGContextMoveToPoint(inContext, adjustedRect.origin.x, adjustedRect.origin.y + adjustedRect.size.height / 2);
                 ::CGContextAddLineToPoint(inContext, adjustedRect.origin.x + adjustedRect.size.width, adjustedRect.origin.y + adjustedRect.size.height / 2);
-                ::CGContextSetGrayStrokeColor(inContext, 0.0, 1.0);
+                ::CGContextSetGrayStrokeColor(inContext, (CellIsSelected(inCell) && mDrawSelection) ? 1.0 : 0.0, 1.0);
                 ::CGContextStrokePath(inContext);
-                ::CGContextClosePath(inContext);
+                //::CGContextClosePath(inContext);
                 
                 // Turn on aliasing for text