Changeset 111 for Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/ToDo_View/CToDoItem.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/ToDo_View/CToDoItem.cp (modified) (4 diffs)

Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/ToDo_View/CToDoItem.cp

@@ -37 +37 @@
 const float cCheckboxHeight = 12.0;
 const float cTextTopOffset = 2.0;
+
+const float body_transparency = 1.0;
+const float line_transparency = 1.0;
+const float text_transparency = 1.0;
 
 // ---------------------------------------------------------------------------
@@ -338 +342 @@
         float green = CGUtils::GetCGGreen(mColour);
         float blue = CGUtils::GetCGBlue(mColour);
-        if (mIsSelected)
-        {
-                CGUtils::UnflattenColours(red, green, blue);
+        if (!mIsSelected)
+        {
+                CGUtils::LightenColours(red, green, blue, true);
         }
 
@@ -366 +370 @@
                 if (mIsSelected)
                 {
-                        CGUtils::UnflattenColours(red, green, blue);
                         ::CGContextSetRGBFillColor(inContext, red, green, blue, 1.0);
                 }
                 else
                 {
-                        ::CGContextSetRGBFillColor(inContext, red, green, blue, 1.0);
+                        CGUtils::LightenColours(red, green, blue, true);
+                        ::CGContextSetRGBFillColor(inContext, red, green, blue, body_transparency);
                 }
                 
@@ -393 +397 @@
         box.top += cTextTopOffset;
         box.bottom = box.top + cItemHeight / 2.0;
-        ::CGContextSetGrayFillColor(inContext, mIsSelected ? 1.0 : 0.0, 1.0);
+        float red = CGUtils::GetCGRed(mColour);
+        float green = CGUtils::GetCGGreen(mColour);
+        float blue = CGUtils::GetCGBlue(mColour);
+        if (mIsSelected)
+        {
+                ::CGContextSetGrayFillColor(inContext, (red + green + blue > 2.5) ? 0.0 : 1.0, 1.0);
+        }
+        else
+        {
+                CGUtils::DarkenColours(red, green, blue);
+                ::CGContextSetRGBFillColor(inContext, red, green, blue, text_transparency);
+        }
         MyCFString trunc1(mSummary, kCFStringEncodingUTF8);
         ::TruncateThemeText(trunc1, kThemeSmallSystemFont, kThemeStateActive, box.right - box.left, truncEnd, NULL);