Merge jv
authorHG Automerge
Thu, 29 Dec 2016 00:16:48 +0000
branchjv
changeset 4253 3f1649b3838f
parent 4252 be9c3684d375 (current diff)
parent 4243 04aec39165c3 (diff)
child 4254 7cccdc94fa82
Merge
--- a/Text.st	Mon Dec 26 10:13:16 2016 +0000
+++ b/Text.st	Thu Dec 29 00:16:48 2016 +0000
@@ -773,6 +773,7 @@
      endPos "{ Class: SmallInteger }"
      x y    
      len    "{ Class: SmallInteger }"
+     bgFill
      yL k value device opaque|
 
     savedFont := aGCOrView basicFont.
@@ -925,10 +926,10 @@
         ].    
         aGCOrView basicFont:font.
         reverse ifTrue:[
-            aGCOrView paint:bgPaint on:color.
+            aGCOrView paint:bgPaint on:(bgFill := color).
             opaque := true.
         ] ifFalse:[
-            aGCOrView paint:color on:bgPaint.
+            aGCOrView paint:color on:(bgFill := bgPaint).
         ].
 
         endPos := pos + runLen - 1.
@@ -941,13 +942,17 @@
 "/            ].
 "/        ].
 
+        len := font widthOf:string from:pos to:endPos.
+
         (opaque and:[etchColor isNil]) ifTrue:[
+            aGCOrView fillRectangleX:x y:y+1 width:len height:(font descent) color:bgFill.
             aGCOrView displayOpaqueString:string from:pos to:endPos x:x y:y.
         ] ifFalse:[
             etchColor notNil ifTrue:[
                 opaque ifTrue:[
                     "/ sigh - must draw the background rectangle;
-                    "/ its easier (and faster) to draw the string twice here ...
+                    "/ it's easier (and faster) to draw the string twice here ...
+                    aGCOrView fillRectangleX:x y:y+1 width:len height:(font descent) color:bgFill.
                     aGCOrView displayOpaqueString:string from:pos to:endPos x:x y:y.
                 ].
                 savedFgPaint := aGCOrView paint.
--- a/UnixPTYStream.st	Mon Dec 26 10:13:16 2016 +0000
+++ b/UnixPTYStream.st	Thu Dec 29 00:16:48 2016 +0000
@@ -242,7 +242,8 @@
                       fileDescriptors:execFdArray
                       fork:true
                       newPgrp:true
-                      inDirectory:aDirectory.
+                      inDirectory:aDirectory
+                      showWindow:nil.
                ]
                action:[:status |
                   status stillAlive ifFalse:[