#BUGFIX by exept
authorClaus Gittinger <cg@exept.de>
Sat, 27 Jul 2019 12:07:17 +0200
changeset 37406b1e0eefb50a
parent 3739 9c7040099cfe
child 3741 373454460851
#BUGFIX by exept
class: ImageEditor
changed: #changeHLS
ImageEditor.st
     1.1 --- a/ImageEditor.st	Thu Jul 25 11:49:10 2019 +0200
     1.2 +++ b/ImageEditor.st	Sat Jul 27 12:07:17 2019 +0200
     1.3 @@ -1,5 +1,3 @@
     1.4 -"{ Encoding: utf8 }"
     1.5 -
     1.6  "
     1.7   COPYRIGHT (c) 1997-1998 by eXept Software AG
     1.8                All Rights Reserved
     1.9 @@ -5811,8 +5809,8 @@
    1.10          resourceSelector notNil ifTrue:[
    1.11              ^ resources 
    1.12                      string:(self modified 
    1.13 -                            ifTrue:['ImageEditor (modified): %1 » %2']
    1.14 -                            ifFalse:['ImageEditor: %1 » %2'])
    1.15 +                            ifTrue:['ImageEditor (modified): %1  %2']
    1.16 +                            ifFalse:['ImageEditor: %1  %2'])
    1.17                      with:resourceClass name
    1.18                      with:resourceSelector
    1.19          ].
    1.20 @@ -5845,8 +5843,8 @@
    1.21          resourceSelector notNil ifTrue:[
    1.22              ^ resources 
    1.23                      string:(self modified 
    1.24 -                            ifTrue:['Image (modified) from: %1 » %2']
    1.25 -                            ifFalse:['Image from: %1 » %2'])
    1.26 +                            ifTrue:['Image (modified) from: %1  %2']
    1.27 +                            ifFalse:['Image from: %1  %2'])
    1.28                      with:resourceClass name
    1.29                      with:resourceSelector
    1.30          ].
    1.31 @@ -6673,7 +6671,9 @@
    1.32          [
    1.33              |hShift lFactor sFactor|
    1.34  
    1.35 -            acceptChannel value:true.
    1.36 +            "/ commented, because this leads to a recursion error
    1.37 +            "/ (holders accept - send shiftAction again - ...)
    1.38 +            "/ acceptChannel value:true.
    1.39  
    1.40              firstChange ifTrue:[
    1.41                  imageEditView makeUndo.
    1.42 @@ -6732,13 +6732,15 @@
    1.43      bindings at:#resetHueShift put:[hueShiftHolder value:0].
    1.44      bindings at:#resetLightFactor put:[lightFactorHolder value:1.0].
    1.45      bindings at:#resetSaturationFactor put:[saturationFactorHolder value:1.0].
    1.46 -    
    1.47 +
    1.48 +    [
    1.49      (self openDialogInterface:#changeHLSDialogSpec withBindings:bindings) 
    1.50      ifFalse:[ 
    1.51          anyChange ifTrue:[
    1.52              imageEditView undo
    1.53          ]
    1.54      ].
    1.55 +    ] ensure:[self halt].
    1.56  
    1.57      (p := shiftProcess) notNil ifTrue:[
    1.58          p waitUntilTerminated.