Changeset 200

Timestamp:

06/26/02 15:50:18 (6 years ago)

Author:

sholloway

Message:

Added Locking methods
Added parentvar/ parentnode

Files:

• trunk/RBSkinning/RBSkinning/SkinObject.py (modified) (5 diffs)
• trunk/RBSkinning/RBSkinning/wxPythonSkin/frame.py (modified) (3 diffs)
• trunk/RBSkinning/RBSkinning/wxTools/test.skin (modified) (1 diff)
• trunk/RBSkinning/RBSkinning/wxTools/wxLockingFrame.py (modified) (7 diffs)

trunk/RBSkinning/RBSkinning/SkinObject.py

@@ -55 +55 @@
-        'contextvar':'',
-        'contextnode':'',
+        'parentvar':'',
+        'parentnode':'',
-        'unravelstop':'0',
-        }
@@ -76 +78 @@
-
-        self.object = None
-
-    #    print '++', self.__class__.__name__
-    #def __del__(self):
-    #    print '--', self.__class__.__name__
-
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -116 +114 @@
-            if self.parent():
-                self.parent().RemoveElement(self)
+
+            # Context Var/Node settings
-            if self.settings.get('contextnode', None):
-
+
+
-            if self.settings.get('contextvar', None) and self.object:
-
+
+
+
+
+
+
+
+
+
+
+
-
-            del self.children
@@ -146 +157 @@
-    def _xmlInitStarted(self):
-        self.SkinInitialize()
+
+        # Context Var/Node settings
-        if self.settings.get('contextnode', None):
-
+
+
-        if self.settings.get('contextvar', None) and self.object:
-
+
+
+
+
+
+
+
+
+
+
+
-
-    def _xmlInitComplete(self):
@@ -161 +185 @@
-            # Now act on knowing that self.object wasn't set before
-            if self.settings.get('contextvar', None):
-
+
+
+
+
+
-

trunk/RBSkinning/RBSkinning/wxPythonSkin/frame.py

@@ -36 +36 @@
-
-from wxSkinObject import wx, wxSkinWindowObject
+from Foundation.wxTools import wxLockingFrame 
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -55 +56 @@
-        'show':     '0',
-        'contextvar':'frame',
-0
+none
-        })
-
@@ -66 +67 @@
-        winParent = self.wxGetParentObject(wx.wxFramePtr) or self.context.application.GetTopWindow()
-        kwSettings = self.wxSettingDict(['id', 'style', 'pos', 'size'], ['name', 'title'])
-
-
-
+
+
+
+
+
+
-        else:
-            self.object = wx.wxFrame(winParent,**kwSettings)

trunk/RBSkinning/RBSkinning/wxTools/test.skin

@@ -1 +1 @@
-<?xml version='1.0'?> 
-<skin:skin xmlns:skin='http://namespaces.runeblade.com/skin' xmlns:py='http://namespaces.runeblade.com/xmlPython' xmlns='http://namespaces.runeblade.com/wxPythonSkin'>
-    <py:inline>
-        from wxPython import wx
-        self.AddNamespace(wx)
-        from wxPython import stc
-        self.AddNamespace(stc)
-        from Foundation import ContextApply
-        self.AddNamespace(ContextApply)
-    </py:inline>
-
-    <application />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <panel> <frame_mover /> </panel>
-    </frame>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-</skin:skin>

trunk/RBSkinning/RBSkinning/wxTools/wxLockingFrame.py

@@ -43 +43 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-ingFrameBase(wx.wxFrame)
+Side
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #~ Constants / Variables / Etc. 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
+
+
+
-
-    _LockingSides = [
@@ -62 +64 @@
-        ]
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    __bLocking = 0
-
@@ -89 +111 @@
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    def SetupScreenLockingSides(Class):
-        l,t,w,h = wx.wxGetClientDisplayRect().asTuple()
-        Class._LockingSides[Class._LeftInnerSide][0][None] = [(l-Class._DeltaResist, t, l+Class._DeltaAttract, t+h, l)]
-        Class._LockingSides[Class._RightInnerSide][0][None] = [(l+w-Class._DeltaAttract, t, l+w+Class._DeltaResist, t+h, l+w)]
-        Class._LockingSides[Class._BottomInnerSide][0][None] = [(l, t+h-Class._DeltaAttract, l+w, t+h+Class._DeltaResist, t+h)]
-        Class._LockingSides[Class._TopInnerSide][0][None] = [(l, t-Class._DeltaResist, l+w, t+Class._DeltaAttract, t)]
-    SetupScreenLockingSides = classmethod(SetupScreenLockingSides)
-
-    def Show(self, bShow=True):
-        result = wx.wxFrame.Show(self, bShow)
-
-
+
-        return result
-
@@ -108 +121 @@
-        else: newpos = pos.x, pos.y
-
-().as
+
-        result = wx.wxFrame.Move(self, newpos)
-
@@ -114 +127 @@
-        return result
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    def _OnSizeFrame(self, evt):
-        self._SaveSidePositions()
-        if not self.__bLocking:
-            self.__bLocking = 1
-().asTuple(), self.GetSize().as
+Tuple(), self.GetSize
-            newpos, newsize = self._OnLockingSize(pos, size)
-            self.SetDimensions(*(newpos + newsize))
-            self.__bLocking = 0
+        self._SaveSidePositions()
-        evt.Skip()
-
-    def _OnMoveFrame(self, evt):
-        self._SaveSidePositions()
-        if not self.__bLocking:
-            self.__bLocking= 1
-().asTuple(), self.GetSize().as
+Tuple(), self.GetSize
-            newpos, newsize = self._OnLockingMove(pos, size)
-            self.SetDimensions(*(newpos + newsize))
-            self.__bLocking= 0
+        self._SaveSidePositions()
-        evt.Skip()
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Protected Methods 
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    def _RemoveSidePositions(self):
-        if self._weakself:
-            self._weakself = None
-            for each in self._LockingSides:
-                del each[0][self._weakself]
+            self._weakself = None
-
-    def _SaveSidePositions(self):
+        if not self.IsShown() or self.IsIconized():
+            return self._RemoveSidePositions()
-        self._weakself = weakref.ref(self)
-        l,t,w,h = self.GetRect().asTuple()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def _OnLockingMove(self, pos, size):
@@ -193 +219 @@
-                        elif WidthIdx == 2: pos = Side[-1]-w, pos[1], 
-                        elif WidthIdx == 3: pos = pos[0], Side[-1]-h, 
-                        self.OnLocktoFrame(self._weakself, pos)
-                        break
-        return pos, size
@@ -209 +234 @@
-                        elif WidthIdx == 2: size = Side[-1]-pos[0], size[1], 
-                        elif WidthIdx == 3: size = size[0], Side[-1]-pos[1], 
-                        self.OnLocktoFrame(self._weakself, pos)
-                        break
-        return pos, size
-
+    #~ Utilities ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def _GetIntersectionPositions(self, l, t, w, h, wP=0, hP=0):
+        return [
+            l-wP, #LeftSide
+            t-hP, #TopSide
+            l+w, #RightSide
+            t+h, #BottomSide
+
+            l, #LeftInnerSide
+            t, #TopInnerSide
+            l+w-wP, #RightInnerSide
+            t+h-hP, #BottomInnerSide
+            ]
+
+    def _GetIntersectionSides(self, l, t, w, h):
+        return [
+            (l+w, t, l+w, t+h), # Right - Outter
+            (l, t+h, l+w, t+h), # Bottom - Outter
+            (l, t, l, t+h), # Left - Outter
+            (l, t, l+w, t), # Top - Outter
+
+            (l, t, l, t+h), # Left - Inner
+            (l, t, l+w, t), # Top - Inner
+            (l+w, t, l+w, t+h), # Right - Inner
+            (l, t+h, l+w, t+h), # Bottom - Inner
+            ]
+
+    def _Intersects(self, A, B):
+        if A[0] > B[2]: return 0
+        if B[0] > A[2]: return 0
+        if A[1] > B[3]: return 0
+        if B[1] > A[3]: return 0
+        return 1
+
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+wxLockingFrameBase.SetupScreenLockingSides()
+
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class wxAttractiveLockingFrame(wxLockingFrameBase):
-    _LockingSides = wxLockingFrameBase._LockingSides[:]
-    _DeltaAttract = 20
-    _DeltaResist = 0
-    _DeltaWing = 10
-
-wxAttractiveLockingFrame.SetupScreenLockingSides()
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class wxResistiveLockingFrame(wxLockingFrameBase):
-    _LockingSides = wxLockingFrameBase._LockingSides[:]
-    _DeltaAttract = 0
-    _DeltaResist = 20
-    _DeltaWing = 10
-
-wxResistiveLockingFrame.SetupScreenLockingSides()
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class wxLockingFrame(wxLockingFrameBase):
-    _LockingSides = wxLockingFrameBase._LockingSides[:]
-    _DeltaAttract = 10
-    _DeltaResist = 10
-
-
-
-
-
+