[squeak-dev] The Trunk: Morphic-mt.804.mcz

commits at source.squeak.org commits at source.squeak.org
Wed Apr 1 14:44:43 UTC 2015


Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.804.mcz

==================== Summary ====================

Name: Morphic-mt.804
Author: mt
Time: 1 April 2015, 4:44:05.045 pm
UUID: bbe870c0-cd4a-4f4d-b12a-7da72c2e797e
Ancestors: Morphic-mt.803

Another fix for horizontal scroll bars in scroll panes, which affects layouting and scrolling.

=============== Diff against Morphic-mt.803 ===============

Item was changed:
  ----- Method: ScrollPane>>hLeftoverScrollRange (in category 'geometry') -----
  hLeftoverScrollRange
  	"Return the entire scrolling range minus the currently viewed area."
  	| w |
  	scroller hasSubmorphs ifFalse:[^0].
  	w :=  bounds width.
  	self vIsScrollbarShowing ifTrue:[ w := w - self scrollBarThickness ].
+ 	^ (self hTotalScrollRange - w roundTo: self scrollDeltaWidth) max: 0
- 	^ (self hTotalScrollRange - w roundTo: self scrollDeltaHeight) max: 0
  !

Item was changed:
  ----- Method: ScrollPane>>hResizeScrollBar (in category 'geometry') -----
  hResizeScrollBar
  
  	| topLeft h border offset |
  
  "TEMPORARY: IF OLD SCROLLPANES LYING AROUND THAT DON'T HAVE A hScrollBar, INIT THEM"
  	hScrollBar ifNil: [ self hInitScrollBarTEMPORARY].
  	
  	(self valueOfProperty: #noHScrollBarPlease ifAbsent: [false]) ifTrue: [^self].
  	bounds ifNil: [ self fullBounds ].
  	
  	h := self scrollBarThickness.
  	border := borderWidth.
+ 	offset := (scrollBarOnLeft and: [self vIsScrollbarShowing])
+ 		ifTrue: [h]
+ 		ifFalse: [0].
- 	offset := scrollBarOnLeft ifTrue: [h] ifFalse: [0].
  	
  	topLeft := retractableScrollBar
  				ifTrue: [bounds bottomLeft + (border + offset @ border negated)]
  				ifFalse: [bounds bottomLeft + (border + offset @ (h + border) negated)].
  
  	hScrollBar bounds: (topLeft + (-1 at 1) extent: self hScrollBarWidth@ h)
  !



More information about the Squeak-dev mailing list