Changeset 254

Timestamp:

08/29/08 15:42:07 (4 months ago)

Author:

tal

Message:

- New GlyphMultilineView. It is highly experimental and incomplete.
- Drawing tweaks to the cell and collection views.

Files:

• packages/defconAppKit/trunk/Lib/defconAppKit/views/glyphCellView.py (modified) (3 diffs)
• packages/defconAppKit/trunk/Lib/defconAppKit/views/glyphCollectionView.py (modified) (1 diff)
• packages/defconAppKit/trunk/Lib/defconAppKit/views/glyphMultilineView.py (added)

packages/defconAppKit/trunk/Lib/defconAppKit/views/glyphCellView.py

@@ -11 +11 @@
-gridColor = backgroundColor = NSColor.colorWithCalibratedWhite_alpha_(.6, 1.0)
-selectionColor = NSColor.colorWithCalibratedRed_green_blue_alpha_(.82, .82, .9, 1.0)
+selectionColor = NSColor.colorWithCalibratedRed_green_blue_alpha_(.62, .62, .7, .5)
-
-
@@ -253 +254 @@
-        NSColor.whiteColor().set()
-        for index, glyph in enumerate(self._glyphs):
--
+ - 
-            rect = ((left, t), (cellWidth, cellHeight))
+
+            NSRectFill(rect)
-
-            self._clickRectsToIndex[rect] = index
-            self._indexToClickRects[index] = rect
-
-            if index in self._selection:
-                selectionColor.set()
-                NSRectFill(rect)
-                NSColor.whiteColor().set()
-            else:
-                NSRectFill(rect)
-
-            image = glyph.getRepresentation(representationName, width=cellWidth, height=cellHeight, **representationArguments)
@@ -270 +266 @@
-                (left, t), ((0, 0), (cellWidth, cellHeight)), NSCompositeSourceOver, 1.0
-                )
+
+            if index in self._selection:
+                selectionColor.set()
+                r = ((left+1, t+1), (cellWidth-3, cellHeight-3))
+                NSRectFillUsingOperation(r, NSCompositePlusDarker)
+                NSColor.whiteColor().set()
+
-            left += cellWidth
-
-            if left + cellWidth > width:
-                left = 0

packages/defconAppKit/trunk/Lib/defconAppKit/views/glyphCollectionView.py

@@ -115 +115 @@
-            listColumnDescriptions = [dict(title="Name", attribute="name")]
-        super(GlyphCollectionView, self).__init__(posSize, [], columnDescriptions=listColumnDescriptions,
-
+ selectionCallback=selectionCallback,
-            showColumnTitles=listShowColumnTitles, enableTypingSensitivity=True, enableDelete=enableDelete,
-            autohidesScrollers=False,