The Trunk: Morphic-cmm.1306.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-cmm.1306.mcz

commits-2
Chris Muller uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-cmm.1306.mcz

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

Name: Morphic-cmm.1306
Author: cmm
Time: 14 September 2016, 4:53:42.843871 pm
UUID: 53b3f640-bc3a-42e9-bb01-66c8a4afc483
Ancestors: Morphic-bf.1306

Fix docking bars occluding windows when pinch-resizing them.

=============== Diff against Morphic-bf.1306 ===============

Item was changed:
  ----- Method: HaloMorph>>doResizeTarget: (in category 'dragging or resizing') -----
+ doResizeTarget: evt
+ | newExtent |
- doResizeTarget: evt
-
- | oldExtent newExtent newPosition |
  newExtent := originalExtent + (evt position - positionOffset * 2).
+ (newExtent x > 1 and: [ newExtent y > 1 ]) ifTrue:
+ [ | oldExtent dockingBarBottom newPosition |
+ oldExtent := target extent.
+ dockingBarBottom := owner mainDockingBars
+ inject: 0
+ into: [ : bottomMostBottom : each | bottomMostBottom max: each bottom ].
+ target setExtentFromHalo: (newExtent min: owner extent x @ (owner extent y - dockingBarBottom)).
+ newPosition := target position - (target extent - oldExtent // 2).
+ newPosition := (newPosition x
+ min: owner extent x - newExtent x
+ max: 0) @
+ (newPosition y
+ min: owner extent y - newExtent y
+ max: dockingBarBottom).
+ target
+ setConstrainedPosition: newPosition
+ hangOut: true ].
+ self bounds: self target worldBoundsForHalo!
-
- (newExtent x > 1 and: [newExtent y > 1])
- ifTrue: [
- oldExtent := target extent.
- target setExtentFromHalo: (newExtent min: owner extent).
- newPosition := target position - (target extent - oldExtent // 2).
- newPosition := (newPosition x min: owner extent x - newExtent x max: 0) @ (newPosition y min: owner extent y - newExtent y max: 0).
- target setConstrainedPosition: newPosition hangOut: true].
-
- self bounds: self target worldBoundsForHalo.!