# HG changeset patch # User Claus Gittinger # Date 1564222037 -7200 # Node ID 6b1e0eefb50a50c0bbce492332ae9e22bf7b52f4 # Parent 9c7040099cfe9184b7718a33cb8e98f07f437bca #BUGFIX by exept class: ImageEditor changed: #changeHLS diff -r 9c7040099cfe -r 6b1e0eefb50a ImageEditor.st --- a/ImageEditor.st Thu Jul 25 11:49:10 2019 +0200 +++ b/ImageEditor.st Sat Jul 27 12:07:17 2019 +0200 @@ -1,5 +1,3 @@ -"{ Encoding: utf8 }" - " COPYRIGHT (c) 1997-1998 by eXept Software AG All Rights Reserved @@ -5811,8 +5809,8 @@ resourceSelector notNil ifTrue:[ ^ resources string:(self modified - ifTrue:['ImageEditor (modified): %1 » %2'] - ifFalse:['ImageEditor: %1 » %2']) + ifTrue:['ImageEditor (modified): %1 » %2'] + ifFalse:['ImageEditor: %1 » %2']) with:resourceClass name with:resourceSelector ]. @@ -5845,8 +5843,8 @@ resourceSelector notNil ifTrue:[ ^ resources string:(self modified - ifTrue:['Image (modified) from: %1 » %2'] - ifFalse:['Image from: %1 » %2']) + ifTrue:['Image (modified) from: %1 » %2'] + ifFalse:['Image from: %1 » %2']) with:resourceClass name with:resourceSelector ]. @@ -6673,7 +6671,9 @@ [ |hShift lFactor sFactor| - acceptChannel value:true. + "/ commented, because this leads to a recursion error + "/ (holders accept - send shiftAction again - ...) + "/ acceptChannel value:true. firstChange ifTrue:[ imageEditView makeUndo. @@ -6732,13 +6732,15 @@ bindings at:#resetHueShift put:[hueShiftHolder value:0]. bindings at:#resetLightFactor put:[lightFactorHolder value:1.0]. bindings at:#resetSaturationFactor put:[saturationFactorHolder value:1.0]. - + + [ (self openDialogInterface:#changeHLSDialogSpec withBindings:bindings) ifFalse:[ anyChange ifTrue:[ imageEditView undo ] ]. + ] ensure:[self halt]. (p := shiftProcess) notNil ifTrue:[ p waitUntilTerminated.