[gnue] r8385 - in trunk/gnue-designer/src: forms/PagePainter forms/PagePainter/skins ui/wx/uihelpers/doccanvas

[jcater]

Author: jcater
Date: 2006-04-06 10:29:31 -0500 (Thu, 06 Apr 2006)
New Revision: 8385

Modified:
   trunk/gnue-designer/src/forms/PagePainter/PagePainter.py
   trunk/gnue-designer/src/forms/PagePainter/skins/common.py
   trunk/gnue-designer/src/forms/PagePainter/skins/default.py
   trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/canvas.py
   trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/widget.py
Log:
fix for WinXP PaintDC error
draw a special border around sibling objects on moving

Modified: trunk/gnue-designer/src/forms/PagePainter/PagePainter.py
===================================================================
--- trunk/gnue-designer/src/forms/PagePainter/PagePainter.py    2006-04-06 
14:38:05 UTC (rev 8384)
+++ trunk/gnue-designer/src/forms/PagePainter/PagePainter.py    2006-04-06 
15:29:31 UTC (rev 8385)
@@ -61,7 +61,7 @@
     def init(self, object):
 
         # Determine text extents
-        dc = wx.PaintDC(self)
+        dc = wx.ClientDC(self)
         base_font = wx.NORMAL_FONT
         fixed_font = wx.Font(base_font.GetPointSize(),
                             wx.MODERN, wx.NORMAL, wx.NORMAL)

Modified: trunk/gnue-designer/src/forms/PagePainter/skins/common.py
===================================================================
--- trunk/gnue-designer/src/forms/PagePainter/skins/common.py   2006-04-06 
14:38:05 UTC (rev 8384)
+++ trunk/gnue-designer/src/forms/PagePainter/skins/common.py   2006-04-06 
15:29:31 UTC (rev 8385)
@@ -120,7 +120,6 @@
         # TODO: eventually, this will show tab-order icons
         pass
 
-
     def move_from_canvas(self, delta_x, delta_y):
         """
         Called when the object is moved via mouse

Modified: trunk/gnue-designer/src/forms/PagePainter/skins/default.py
===================================================================
--- trunk/gnue-designer/src/forms/PagePainter/skins/default.py  2006-04-06 
14:38:05 UTC (rev 8384)
+++ trunk/gnue-designer/src/forms/PagePainter/skins/default.py  2006-04-06 
15:29:31 UTC (rev 8385)
@@ -207,6 +207,15 @@
                         y + 1)
             x += char_x_scale
 
+    def draw_sibling_border(self, dc):
+        """
+        Draw a border for selected widgets
+        """
+        x, y, w, h = self.hit_test_area.Get()
+        dc.SetBrush(wx.Brush(wx.BLACK, wx.TRANSPARENT))
+        dc.SetPen(wx.Pen(color_map['selectedframe']))
+        dc.DrawLine(3, h, w  + 5, h)
+
     def enter_edit_mode(self):
         """
         Called when the user double-clicks to edit

Modified: trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/canvas.py
===================================================================
--- trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/canvas.py 2006-04-06 
14:38:05 UTC (rev 8384)
+++ trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/canvas.py 2006-04-06 
15:29:31 UTC (rev 8385)
@@ -785,6 +785,13 @@
 
             memory_dc.SetDeviceOrigin(obj_x - buff_x, obj_y - buff_y)
             widget.draw_widget(memory_dc)
+            # If the widget is implicitly being moved because it is a 
+            # sibling (i.e., labels attached to fields), draw a special 
+            # border around the sibling. 
+            if wx.IntersectRect(widget.hit_test_area, 
+                    self.__selection_area) != widget.hit_test_area:  
+              widget.draw_sibling_border(memory_dc)
+              
             memory_dc.SetDeviceOrigin(0,0)
 
         # Draw a selection box

Modified: trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/widget.py
===================================================================
--- trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/widget.py 2006-04-06 
14:38:05 UTC (rev 8384)
+++ trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/widget.py 2006-04-06 
15:29:31 UTC (rev 8385)
@@ -146,6 +146,12 @@
         dc.SetPen(wx.Pen(color_map['selectedframe']))
         dc.DrawRectangle(3, 3, w  + 2, h + 2)
 
+    def draw_sibling_border(self, dc):
+        """
+        Draw a border for widgets implicitly selected because they
+        are a linked sibling. 
+        """
+        return self.draw_border(dc)
 
     def select_hit_test(self, x, y):
         """