--- a/ImageEditor.st	Thu Feb 10 00:47:10 2000 +0100
+++ b/ImageEditor.st	Fri Feb 11 14:09:42 2000 +0100
@@ -1432,7 +1432,9 @@
 imageEditView
     "returns the view of the image"
 
-    ^imageEditView := (builder componentAt: #imageEditView) subViews first 
+    ^ imageEditView := (builder componentAt: #imageEditView) scrolledView
+
+    "Modified: / 10.2.2000 / 23:19:20 / cg"
 !
 
 imagePreView
@@ -1610,9 +1612,32 @@
         ^ self.
     ].
 
+    changedObject == imageEditView ifTrue:[
+        something == #imageColors ifTrue:[
+            self listOfColors contents:self image colorMap.
+            self findColorMapMode.
+            ^ self.
+        ].
+        something == #image ifTrue:[
+            self imagePreView image:self image.
+            ^ self.
+        ].
+        something == #subImageIn ifTrue:[
+            self imagePreView redraw:aParameter.
+            ^ self.
+        ].
+
+        ^ self.
+    ].
+
+    changedObject == imageEditView image ifTrue:[
+        self halt.
+        ^ self.
+    ].
+
     super update:something with:aParameter from:changedObject
 
-    "Modified: / 18.8.1998 / 17:18:42 / cg"
+    "Modified: / 10.2.2000 / 23:36:49 / cg"
 !
 
 updateForNoImage
@@ -1870,14 +1895,17 @@
 mouseKeyColorMode
     "returns mouseKeyColorMode"
 
-    mouseKeyColorMode isNil
-    ifTrue:
-    [
+    mouseKeyColorMode isNil ifTrue:[
         mouseKeyColorMode := 1 asValue.
-        mouseKeyColorMode onChangeEvaluate: [imageEditView mouseKeyColorMode: mouseKeyColorMode value. self selectionOfColor value: (self listOfColors indexOf: imageEditView selectedColor).]
+        mouseKeyColorMode onChangeEvaluate: [
+            imageEditView mouseKeyColorMode:mouseKeyColorMode value. 
+            self selectionOfColor value: (self listOfColors indexOf:imageEditView selectedColor).
+        ]
     ].
 
     ^mouseKeyColorMode
+
+    "Modified: / 10.2.2000 / 23:16:42 / cg"
 ! !
 
 !ImageEditor methodsFor:'queries'!
@@ -1969,6 +1997,14 @@
     imageEditView undoImages addDependent:self.
     imageEditView imageInfoHolder:(self imageInfoHolder).
     imageEditView activityInfoHolder:(self activityInfoHolder).
+    imageEditView clickInfoCallBack:[:button :point | 
+                        |mouseButtonColorToolBar|
+
+                        mouseButtonColorToolBar := builder componentAt:#MouseButtonColorToolBar.
+                        (mouseButtonColorToolBar itemAt:button) toggleIndication.
+                        mouseButtonColorToolBar do: [:i| i updateIndicators].
+                  ].
+    imageEditView addDependent:self.
 
     postOpenAction notNil ifTrue: [postOpenAction value].
 
@@ -1976,7 +2012,7 @@
 
     aBuilder keyboardProcessor menuBar:nil.
 
-    "Modified: / 29.7.1998 / 18:49:20 / cg"
+    "Modified: / 10.2.2000 / 23:17:43 / cg"
 ! !
 
 !ImageEditor methodsFor:'user actions - colormap'!