Merge jv
authorMerge Script
Fri, 18 Nov 2016 06:52:16 +0100
branchjv
changeset 5337 0a2b6f94bde9
parent 5329 2baf5daabd0e (current diff)
parent 5336 c1933e2d616e (diff)
child 5341 e49874930486
Merge
MenuPanel.st
NoteBookView.st
TerminalView.st
--- a/FilenameWidgetWithHistory.st	Wed Nov 16 06:42:54 2016 +0100
+++ b/FilenameWidgetWithHistory.st	Fri Nov 18 06:52:16 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2007 by eXept Software AG
               All Rights Reserved
@@ -165,11 +163,35 @@
     fileNameEntryField acceptChannel:aValueHolder.
 !
 
+backgroundChannel
+    ^ fileNameEntryField backgroundChannel
+
+    "Created: / 17-11-2016 / 21:34:10 / cg"
+!
+
+backgroundChannel:aValueHolder
+    fileNameEntryField backgroundChannel:aValueHolder.
+
+    "Created: / 17-11-2016 / 21:32:04 / cg"
+!
+
 enableChannel:aValueHolder
     fileNameEntryField enableChannel:aValueHolder.
     browseButton enableChannel:aValueHolder.
 !
 
+foregroundChannel
+    ^ fileNameEntryField foregroundChannel
+
+    "Created: / 17-11-2016 / 21:34:17 / cg"
+!
+
+foregroundChannel:aValueHolder
+    fileNameEntryField foregroundChannel:aValueHolder.
+
+    "Created: / 17-11-2016 / 21:32:11 / cg"
+!
+
 modifiedChannel:aValueHolder
     fileNameEntryField modifiedChannel:aValueHolder.
 
--- a/ImageEditView.st	Wed Nov 16 06:42:54 2016 +0100
+++ b/ImageEditView.st	Fri Nov 18 06:52:16 2016 +0100
@@ -1283,8 +1283,8 @@
     needRedraw := true.
     (oldX == 0 and:[oldY == 0]) ifTrue:[
         needRedraw := false.
-        redrawRect1 := ((newWidth@0) * magnification) corner:((oldWidth@oldHeight)+1 * magnification).
-        redrawRect2 := ((0@newHeight) * magnification) corner:((oldWidth@oldHeight)+1 * magnification).
+        redrawRect1 := ((newWidth@0) * magnification) corner:(((oldWidth@oldHeight)+1) * magnification).
+        redrawRect2 := ((0@newHeight) * magnification) corner:(((oldWidth@oldHeight)+1) * magnification).
     ].
     self image:newImage scroll:false invalidate:needRedraw.
     redrawRect1 notNil ifTrue:[
@@ -1295,8 +1295,9 @@
     ].
     self setModified.
 
-    "Created: / 7.9.1998 / 13:00:16 / cg"
-    "Modified: / 7.9.1998 / 14:15:32 / cg"
+    "Created: / 07-09-1998 / 13:00:16 / cg"
+    "Modified: / 07-09-1998 / 14:15:32 / cg"
+    "Modified (format): / 16-11-2016 / 23:07:50 / cg"
 !
 
 makeUndo
--- a/MenuPanel.st	Wed Nov 16 06:42:54 2016 +0100
+++ b/MenuPanel.st	Fri Nov 18 06:52:16 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1997 by eXept Software AG
 	      All Rights Reserved
@@ -9169,13 +9167,15 @@
 
     (icon isNil or:[icon device ~~ menusDevice]) ifTrue:[
         icon := self class icon.
-        index > 1 ifTrue:[ icon := icon rotated:(index - 1 * 90) ]
+        index > 1 ifTrue:[ icon := icon rotated:((index - 1) * 90) ]
                  ifFalse:[ icon := icon copy ].
 
         icon := icon onDevice:menusDevice.
         icons at:index put:icon
     ].
     ^ icon
+
+    "Modified (format): / 16-11-2016 / 23:12:59 / cg"
 ! !
 
 !MenuPanel::ScrollActivity methodsFor:'initialization'!
--- a/NoteBookView.st	Wed Nov 16 06:42:54 2016 +0100
+++ b/NoteBookView.st	Fri Nov 18 06:52:16 2016 +0100
@@ -861,7 +861,7 @@
         ].
     ].
     y := y + selectionInsetY + lvl + tabTopMargin + tabBottomMargin.
-    x := x + selectionInsetX + selectionInsetX + (lvl + lvl * size).
+    x := x + selectionInsetX + selectionInsetX + ((lvl + lvl) * size).
 
     isHorizontal := self isHorizontal.
 
@@ -888,6 +888,8 @@
 
     isHorizontal ifTrue:[ ^ x @ y ].
     ^ y @ x
+
+    "Modified (format): / 16-11-2016 / 23:13:18 / cg"
 !
 
 preferredExtentForTab:aTab
--- a/Slider.st	Wed Nov 16 06:42:54 2016 +0100
+++ b/Slider.st	Fri Nov 18 06:52:16 2016 +0100
@@ -261,7 +261,7 @@
 
     enabled ifFalse:[^ self].
 
-    step := keyboardStep ? (rangeEnd - rangeStart / 10).
+    step := keyboardStep ? ((rangeEnd - rangeStart) / 10).
 
     (key == #CursorLeft
     or:[key == #CursorUp
@@ -278,6 +278,8 @@
     ].
 
     super keyPress:key x:x y:y
+
+    "Modified (format): / 16-11-2016 / 23:13:56 / cg"
 ! !
 
 !Slider methodsFor:'forced scroll'!
@@ -398,6 +400,6 @@
 !Slider class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/Slider.st,v 1.39 2015-01-23 16:29:14 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/TerminalView.st	Wed Nov 16 06:42:54 2016 +0100
+++ b/TerminalView.st	Fri Nov 18 06:52:16 2016 +0100
@@ -2577,11 +2577,12 @@
     "return my preferred extent - this is computed from my numberOfLines,
      numberOfCols and font size"
 
-    ^ (fontWidth * self class defaultNumberOfColumns + (leftMargin + margin * 2))
+    ^ (fontWidth * self class defaultNumberOfColumns + ((leftMargin + margin) * 2))
       @ 
       ((self heightForLines:self class defaultNumberOfLines) + 8)
 
-    "Modified: / 20.6.1998 / 20:06:57 / cg"
+    "Modified: / 20-06-1998 / 20:06:57 / cg"
+    "Modified (format): / 16-11-2016 / 23:14:18 / cg"
 !
 
 terminalType