ImageEditView.st
changeset 5653 0cc4e96d490b
parent 5652 ba62eb22a43d
child 5654 587fc5c36cc9
--- a/ImageEditView.st	Thu Dec 07 14:49:56 2017 +0100
+++ b/ImageEditView.st	Thu Dec 07 15:04:31 2017 +0100
@@ -2214,7 +2214,7 @@
 
     self 
         commonBoxOperation:[:box :colorOrPixel |
-            colorOrPixel isColor notNil ifTrue:[
+            colorOrPixel isColor ifTrue:[
                 image drawRectangle:box withColor:colorOrPixel.
             ] ifFalse:[
                 image drawRectangle:box withValue:colorOrPixel.
@@ -2222,7 +2222,7 @@
         ]
         at:aPoint
 
-    "Modified: / 16-02-2017 / 11:22:11 / cg"
+    "Modified: / 07-12-2017 / 14:52:17 / cg"
 !
 
 circleAt: aPoint
@@ -2232,7 +2232,7 @@
 
     self 
         commonBoxOperation:[:box :colorOrPixel |
-            colorOrPixel isColor notNil ifTrue:[
+            colorOrPixel isColor ifTrue:[
                 image drawEllipse:box withColor:colorOrPixel lineWidth:penWidth.
             ] ifFalse:[
                 image drawEllipse:box withValue:colorOrPixel lineWidth:penWidth.
@@ -2240,7 +2240,7 @@
         ]
         at:aPoint
 
-    "Modified: / 26-02-2017 / 17:20:54 / cg"
+    "Modified: / 07-12-2017 / 14:53:34 / cg"
 !
 
 commonBoxOperation:action at:aPoint
@@ -2255,7 +2255,8 @@
             (clr := self drawingColorOrNil) notNil ifTrue:[
                 action value:imageBox value:clr.
             ] ifFalse:[
-                (pix := self drawingPixelOrNil) notNil ifTrue:[
+                pix := self drawingPixelOrNil.
+                true "pix notNil" ifTrue:[ "/ nil is valid here, and means: masked
                     action value:imageBox value:pix.
                 ].
             ].
@@ -2270,6 +2271,7 @@
     ].
 
     "Created: / 16-02-2017 / 11:20:49 / cg"
+    "Modified: / 07-12-2017 / 14:51:37 / cg"
 !
 
 copyAt: aPoint
@@ -2367,7 +2369,7 @@
 
     self 
         commonBoxOperation:[:box :colorOrPixel |
-            colorOrPixel isColor notNil ifTrue:[
+            colorOrPixel isColor ifTrue:[
                 image fillEllipse:box withColor:colorOrPixel.
             ] ifFalse:[
                 image fillEllipse:box withValue:colorOrPixel.
@@ -2376,6 +2378,7 @@
         at:aPoint
 
     "Created: / 16-02-2017 / 11:10:17 / cg"
+    "Modified: / 07-12-2017 / 14:53:59 / cg"
 !
 
 maskOutsideCircleAt: aPoint