The Trunk: Morphic-mt.893.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-mt.893.mcz

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

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

Name: Morphic-mt.893
Author: mt
Time: 17 April 2015, 3:25:03.42 pm
UUID: b93f8719-1644-fd46-8f4c-2a795ed1e80b
Ancestors: Morphic-tfel.892

Fix several layouting issues related to sliders, scroll bars, and scroll panes.

Note: Due to the nature of sliders, their #hResizing and #vResizing values are coupled to their orientation and thus will stricly be derived out of that to work fine with table layout.

=============== Diff against Morphic-tfel.892 ===============

Item was changed:
  ----- Method: HSVAColorSelectorMorph>>newAColorMorph (in category 'as yet unclassified') -----
  newAColorMorph
  "Answer a new alpha color morph."
 
  ^AColorSelectorMorph new
  model: self;
  hResizing: #spaceFill;
  vResizing: #rigid;
  setValueSelector: #alphaSelected:;
+ extent: 50@24!
- extent: 24@24!

Item was changed:
  ----- Method: ScrollBar>>minExtent (in category 'geometry') -----
  minExtent
  "The minimum extent is that of 2 or 3 buttons in a row or column,
  the 'up' and 'down' button and optionally the 'menu' button."
 
  | buttonCount refExtent refBorder |
  refExtent := upButton minExtent.
  refBorder := upButton borderWidth.
  buttonCount := {
  upButton visible.
  downButton visible.
  self menuButton visible. } count: [:ea | ea].
  ^ self orientation == #horizontal
+ ifTrue: [super minExtent max: ((buttonCount * refExtent x) - (buttonCount-1 * refBorder)) @ 5]
+ ifFalse: [super minExtent max: 5 @ ((buttonCount * refExtent y) - (buttonCount-1 * refBorder))]!
- ifTrue: [((buttonCount * refExtent x) - (buttonCount-1 * refBorder)) @ 5]
- ifFalse: [5 @ ((buttonCount * refExtent y) - (buttonCount-1 * refBorder))]!

Item was changed:
  ----- Method: ScrollBar>>sliderThickness (in category 'geometry') -----
  sliderThickness
+ ^ self orientation == #horizontal
+ ifTrue: [self height]
+ ifFalse: [self width]!
- ^ self width min: self height!

Item was changed:
  ----- Method: Slider>>extent: (in category 'geometry') -----
  extent: newExtent
 
  (bounds extent closeTo: newExtent) ifTrue: [^ self].
 
+ super extent: newExtent.
- super extent: (newExtent max: self minExtent).
 
  self updateSlider.!

Item was added:
+ ----- Method: Slider>>hResizing (in category 'as yet unclassified') -----
+ hResizing
+
+ ^ self orientation == #horizontal
+ ifTrue: [#spaceFill]
+ ifFalse: [#rigid]!

Item was changed:
  ----- Method: Slider>>minExtent (in category 'geometry') -----
  minExtent
 
  ^ self orientation == #horizontal
+ ifTrue: [super minExtent max: (self sliderThickness * 2) @ (self borderWidth + 1)]
+ ifFalse: [super minExtent max: (self borderWidth + 1) @ (self sliderThickness * 2)]!
- ifTrue: [(self sliderThickness * 2) @ (self borderWidth + 1)]
- ifFalse: [(self borderWidth + 1) @ (self sliderThickness * 2)]!

Item was added:
+ ----- Method: Slider>>vResizing (in category 'as yet unclassified') -----
+ vResizing
+
+ ^ self orientation == #vertical
+ ifTrue: [#spaceFill]
+ ifFalse: [#rigid]!