ImageEditView.st
changeset 3730 3f07e7082aff
parent 3729 6f6cfc8bb8cf
child 3762 1baf6a044dd2
--- a/ImageEditView.st	Fri Aug 07 18:35:33 2009 +0200
+++ b/ImageEditView.st	Fri Aug 07 18:53:19 2009 +0200
@@ -17,7 +17,7 @@
 		lastPastePoint imageInfoHolder activityInfoHolder
 		pickedColorHolder drawingColors drawingPixels drawingColorHolders
 		drawingPixelHolders clickInfoCallBack penWidth sprayProcess
-		sprayPosition spraySpot'
+		sprayPosition spraySpot drawingAlpha'
 	classVariableNames:'Clipboard ClipboardMagnified LastMagnification
 		GridMagnificationLimit MaxUndos LastSaveDirectory LastSaveClass
 		EditModePoint EditModeBox EditModeFilledBox EditModeFill
@@ -319,7 +319,17 @@
 !
 
 selectedColor
-    ^ (drawingColorHolders at:mouseKeyColorMode) value
+    |clr|
+
+    clr := (drawingColorHolders at:mouseKeyColorMode) value.
+    image hasAlphaChannel ifTrue:[
+        ^ (TranslucentColor 
+                scaledRed:clr scaledRed
+                scaledGreen:clr scaledGreen
+                scaledBlue:clr scaledBlue)
+                alpha:(drawingAlpha ? 1.0)
+    ].
+    ^ clr
 !
 
 selectedColor: aColor
@@ -2642,7 +2652,7 @@
 !ImageEditView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ImageEditView.st,v 1.234 2009-08-07 16:35:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ImageEditView.st,v 1.235 2009-08-07 16:53:19 cg Exp $'
 ! !
 
 ImageEditView initialize!