paste mask
authorClaus Gittinger <cg@exept.de>
Tue, 29 Aug 2000 19:54:10 +0200
changeset 1823 d11286b90d3b
parent 1822 911117459699
child 1824 ad38ecd8752d
paste mask
ImageEditView.st
--- a/ImageEditView.st	Thu Aug 24 21:12:23 2000 +0200
+++ b/ImageEditView.st	Tue Aug 29 19:54:10 2000 +0200
@@ -559,7 +559,6 @@
                 "/ still a kludge, but less ugly ...
                 clickInfoCallBack value:button value:p
             ].
-
             "/ editMode is something like #point, #rectangle etc.
             self perform: (editMode, 'At:') asSymbol with:p
         ]
@@ -1063,13 +1062,10 @@
         ].
         self undo.
         self warn: 'Paste failed !!\Increasing the images depth might help.' withCRs. 
-    ] 
-    do:
-    [   
+    ] do: [   
         windowGroup withExecuteCursorDo:[
             |choosedBox imagePoint imgX imgY copiedImage imageBox presentClr newColorMap|
 
-
             choosedBox := self dragRectangleStartingAt: aPoint emphasis: #inverseFilledBox.
 
             imagePoint := choosedBox origin//magnification.
@@ -1142,10 +1138,14 @@
                                     colorAtX:dstX
                                            y:dstY
                                          put:(copiedImage colorAtX:x y:y).
-                                (wasMasked and:[newMasked not]) ifTrue:[
+                                wasMasked ifTrue:[
                                     image mask pixelAtX:dstX y:dstY put:1
                                 ].
-                            ]
+                            ] ifTrue:[
+                                wasMasked ifFalse:[
+                                    image mask pixelAtX:dstX y:dstY put:0
+                                ]
+                            ].
                         ]
                     ]
                 ].
@@ -1751,6 +1751,6 @@
 !ImageEditView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ImageEditView.st,v 1.128 2000-07-17 17:06:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ImageEditView.st,v 1.129 2000-08-29 17:54:10 cg Exp $'
 ! !
 ImageEditView initialize!