Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 31 Aug 2016 11:21:45 +0100
branchjv
changeset 5229 5b8d65dfdb83
parent 5228 4644e610c1b9 (current diff)
parent 5226 24916b8eff22 (diff)
child 5230 f7bdfa2b22bc
Merge
DoWhatIMeanSupport.st
--- a/DoWhatIMeanSupport.st	Tue Aug 23 10:02:37 2016 +0100
+++ b/DoWhatIMeanSupport.st	Wed Aug 31 11:21:45 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
 	      All Rights Reserved
@@ -2346,7 +2348,7 @@
 "/
 "/    info := best storeString.
 "/    implClass notNil ifTrue:[
-"/        info := implClass name , '  ' , info.
+"/        info := implClass name , ' » ' , info.
 "/    ].
 "/    self information:info.
 "/].
@@ -4980,7 +4982,7 @@
 "/
 "/    info := best storeString.
 "/    implClass notNil ifTrue:[
-"/        info := implClass name , '  ' , info.
+"/        info := implClass name , ' » ' , info.
 "/    ].
 "/    self information:info.
 
@@ -6161,14 +6163,13 @@
 
     |valueAndKind|
 
-aVariableName = 'LargeInteger' ifTrue:[self halt.].
     (valueAndKind := self valueAndKindOfVariable:aVariableName) notNil ifTrue:[
         self assert:valueAndKind isArray.
         ^ valueAndKind first.
     ].
     ^ nil
 
-    "Modified: / 01-05-2016 / 12:41:30 / cg"
+    "Modified: / 26-08-2016 / 14:16:16 / cg"
 ! !
 
 !DoWhatIMeanSupport::InputCompletionResult class methodsFor:'instance creation'!
--- a/ImageView.st	Tue Aug 23 10:02:37 2016 +0100
+++ b/ImageView.st	Wed Aug 31 11:21:45 2016 +0100
@@ -57,7 +57,7 @@
         ImageView openOnImage:(Image fromFile:'../../goodies/bitmaps/gifImages/garfield.gif')
         ImageView openOnImage:(Image fromFile:'../../goodies/bitmaps/SBrowser.xbm')
 
-    adjust:     
+    adjust:
         controls how images are displayed;
         can be one of:
             #topLeft    - image is displayed as usual
@@ -221,7 +221,7 @@
     top := StandardSystemView label:aString.
 
     v := HVScrollableView for:self in:top.
-    v origin:0@0 extent:1.0@1.0. 
+    v origin:0@0 extent:1.0@1.0.
     imageView := v scrolledView.
 
     anImage notNil ifTrue:[
@@ -231,7 +231,7 @@
          Since some window managers cannot handle this correctly (twm),
          this is only done when running on an IRIS"
 
-        (true "(OperatingSystem getSystemType = 'iris')" 
+        (true "(OperatingSystem getSystemType = 'iris')"
         and:[StyleSheet name == #iris]) ifTrue:[
             iconView := ImageView new.
 
@@ -254,9 +254,9 @@
                 mag := magX @ magY.
 "
                 "preserve ratio"
-" 
+"
                 mag := (magX min:magY) asPoint.
-" 
+"
 " "
                 mag := (magX max:magY) asPoint.
 " "
@@ -272,7 +272,7 @@
 
     iconView notNil ifTrue:[
         top windowGroup addView:iconView.
-        [ 
+        [
             iconView image:(anImage magnifiedBy:mag).
         ] forkAt:4
     ].
@@ -369,15 +369,15 @@
 
     |oldSize newSize newImageIsSmaller|
 
-    oldSize := image ifNil:[0@0] ifNotNil:[image extent].
+    oldSize := image isNil ifTrue:[0@0] ifFalse:[image extent].
 
     image := anImage.
     magnifiedImage := nil.
     self generateMagnifiedImage.
 
-    newSize := image ifNil:[0@0] ifNotNil:[(magnifiedImage ? image) extent].
+    newSize := image isNil ifTrue:[0@0] ifFalse:[(magnifiedImage ? image) extent].
     newImageIsSmaller := ((oldSize x > newSize x) or:[oldSize y > newSize y]).
-    
+
     (doScroll or:[newImageIsSmaller]) ifTrue:[
         (doInvalidate and:[newImageIsSmaller]) ifTrue:[ self clear ].
         self scrollToTopLeft.
@@ -386,8 +386,8 @@
     oldSize ~= newSize ifTrue:[
         "/ avoid endless loop in case of a resize happening due
         "/ to scrollBar visibility changes.
-        "/ that QuerySignal suppresses another magnification in sizeChanged: 
-        DoNotMagnifyQuery 
+        "/ that QuerySignal suppresses another magnification in sizeChanged:
+        DoNotMagnifyQuery
             answer:true
             do:[
                 self contentsChanged.
@@ -397,7 +397,7 @@
     (shown and:[doInvalidate]) ifTrue:[
 "/        newImageIsSmaller ifTrue:[
 "/            self clear.
-"/        ].    
+"/        ].
         self invalidate
     ].
     self changed:#image.
@@ -530,13 +530,13 @@
                     self clearRectangleX:x y:y width:w height:h.
                     0 to:y+h by:tileOffset y do:[:oY |
                         0 to:x+w by:tileOffset x do:[:oX |
-                            self displayForm:image x:oX y:oY 
+                            self displayForm:image x:oX y:oY
                         ]
                     ].
                 ] ifFalse:[
                     0 to:y+h by:tileOffset y do:[:oY |
                         0 to:x+w by:tileOffset x do:[:oX |
-                            self displayOpaqueForm:image x:oX y:oY 
+                            self displayOpaqueForm:image x:oX y:oY
                         ]
                     ].
                 ].
@@ -551,22 +551,22 @@
             or:[shownImage mask notNil]) ifTrue:[
                 self clearRectangleX:x y:y width:w height:h.
                 shownImage displayOn:self x:xI y:yI.
-                "/ self displayForm:shownImage x:xI y:yI 
+                "/ self displayForm:shownImage x:xI y:yI
             ] ifFalse:[
-                self displayOpaqueForm:shownImage x:xI y:yI 
+                self displayOpaqueForm:shownImage x:xI y:yI
             ].
 
             "/ right of image ?
             right := x + w - 1.
             right > (xI + imgWidth) ifTrue:[
                 self clearRectangleX:(xI + imgWidth) y:y
-                               width:(right - imgWidth - xI) height:h  
+                               width:(right - imgWidth - xI) height:h
             ].
             "/ below of image ?
             bott := y + h - 1.
             bott > (yI + imgHeight) ifTrue:[
                 self clearRectangleX:margin y:(yI + imgHeight)
-                               width:w height:(bott - imgHeight - yI)  
+                               width:w height:(bott - imgHeight - yI)
             ].
         ].
     ]
@@ -622,7 +622,7 @@
 
     magnificationFactor := ((magnificationFactor ? 1) * mul).
     magnificationFactor fractionPart < 0.1 ifTrue:[
-        "magnifying by integer factor is faster"    
+        "magnifying by integer factor is faster"
         magnificationFactor := magnificationFactor truncated.
     ].
     magnifiedImage := nil.