[commits] (jeffrey) [11427] - Minor tweaks to calendar drawing, more reliably stop showing the

[commits]

Title: [commits] (jeffrey) [11427] - Minor tweaks to calendar drawing, more reliably stop showing the

Revision

11427

Author

jeffrey

Date

2006-08-16 15:53:35 -0700 (Wed, 16 Aug 2006)

Log Message

- Minor tweaks to calendar drawing, more reliably stop showing the
end time when drags end, and don't use a small (and thus un-anti-
aliased font) on the mac for timezone superscript

Modified Paths

• trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py
• trunk/chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py
• trunk/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py

Diff

Modified: trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py (11426 => 11427)

--- trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2006-08-16 22:46:04 UTC (rev 11426)
+++ trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2006-08-16 22:53:35 UTC (rev 11427)
@@ -518,9 +518,12 @@
                             
                             textWidth = dc.GetFullTextExtent(timeString,
                                               styles.eventTimeFont)[0]
-                            superscript = Styles.getFont(
-                                size = styles.eventTimeStyle.fontSize * .7
-                                )
+                            size = styles.eventTimeStyle.fontSize * .7
+                            if '__WXMAC__' in wx.PlatformInfo:
+                                # on the Mac anti-aliasing seems to stop at 8px
+                                size = max(size, 9)
+                            
+                            superscript = Styles.getFont(size=size)
                             # This assumes the timezone should be to the right
                             # of the time string.  This isn't necessarily true,
                             # so this isn't really localized yet.

Modified: trunk/chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py (11426 => 11427)

--- trunk/chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py	2006-08-16 22:46:04 UTC (rev 11426)
+++ trunk/chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py	2006-08-16 22:53:35 UTC (rev 11427)
@@ -261,9 +261,8 @@
         
         if self._dragStarted:
             self.StopDragTimer()
-            self.dragEndHandler()
+        self.dragEndHandler()
 
-
 class wxCollectionCanvas(DragAndDrop.DropReceiveWidget, 
                          DragAndDrop.DraggableWidget,
                          DragAndDrop.FileOrItemClipboardHandler,

Modified: trunk/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (11426 => 11427)

--- trunk/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py	2006-08-16 22:46:04 UTC (rev 11426)
+++ trunk/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py	2006-08-16 22:53:35 UTC (rev 11427)
@@ -836,6 +836,8 @@
         if not currentCanvasItem.CanDrag():
             return
 
+        currentCanvasItem.startTime = currentCanvasItem.endTime = None
+
         proxy = RecurrenceDialog.getProxy(u'ui', currentCanvasItem.item,
                                           endCallback=self.wxSynchronizeWidget)
         self.activeProxy = proxy

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits