WindowBuilder.st
changeset 2894 4380670e758e
parent 2873 835095080d19
child 2896 96d5a0b6fc56
--- a/WindowBuilder.st	Mon Feb 28 17:57:20 2011 +0100
+++ b/WindowBuilder.st	Thu Mar 03 19:32:41 2011 +0100
@@ -1457,7 +1457,7 @@
         ]
     ].
 
-    ((type == #dialog) or:[type == #toolDialog]) ifTrue:[
+    ((type == #dialog) or:[type == #toolDialog or:[ type == #popUp] ]) ifTrue:[
         |newOrigin|
 
         ((origin isNil and:[window class forceModalBoxesToOpenAtCenter])
@@ -1483,10 +1483,17 @@
             ].
         ].
         window origin:newOrigin.
+        type == #toolDialog ifTrue:[
+            window beToolDialog
+        ] ifFalse:[
+            type == #popUp ifTrue:[
+                window bePopUpView.
+            ]
+        ].
         ^ window openModal.
     ].
 
-    (type == #normal or:[type = #slave or:[type = #partner]]) ifTrue:[
+    (type == #normal or:[type = #slave or:[type = #partner or:[type = #popUpNotModal]]]) ifTrue:[
         window isNil ifTrue:[
             application notNil ifTrue:[
                 appWinClass := application applicationWindowClass
@@ -1542,9 +1549,14 @@
 
         type = #slave ifTrue:[
             window beSlave.
-        ].
-        type = #partner ifTrue:[
-            window bePartner.
+        ] ifFalse:[
+            type = #partner ifTrue:[
+                window bePartner.
+            ] ifFalse:[
+                type == #popUpNotModal ifTrue:[
+                    window bePopUpView.
+                ]
+            ].
         ].
 
         ((type = #slave or:[type = #partner])
@@ -1565,10 +1577,10 @@
         ^ self
     ].
 
-    type == #popUp ifTrue:[
-        window fixPosition:(device pointerPosition).
-        ^ window openAsPopUp.
-    ].
+"/    type == #popUp ifTrue:[
+"/        window fixPosition:(device pointerPosition).
+"/        ^ window openAsPopUp.
+"/    ].
 
     "
      if ST-80 supports more types - these may be added later
@@ -1576,7 +1588,7 @@
     self shouldImplement
 
     "Created: / 14-02-1997 / 20:22:24 / cg"
-    "Modified: / 22-10-2010 / 13:56:25 / cg"
+    "Modified: / 03-03-2011 / 19:04:05 / cg"
 ! !
 
 !WindowBuilder methodsFor:'translating'!
@@ -1594,9 +1606,9 @@
 !WindowBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.145 2010-10-22 12:54:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.146 2011-03-03 18:32:41 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.145 2010-10-22 12:54:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.146 2011-03-03 18:32:41 cg Exp $'
 ! !