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

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

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

Name: Morphic-mt.916
Author: mt
Time: 22 April 2015, 5:26:19.456 pm
UUID: 1c003afb-32fd-1e47-b0dc-e7faa1377444
Ancestors: Morphic-cmm.915

Fixed implementations of minWidth and minHeight for ScrollPanes, Sliders, and their subclasses.

=============== Diff against Morphic-cmm.915 ===============

Item was removed:
- ----- Method: PluggableTextMorph>>minWidth (in category 'geometry') -----
- minWidth
- ^ 38!

Item was removed:
- ----- 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))]!

Item was added:
+ ----- Method: ScrollBar>>minHeight (in category 'geometry') -----
+ minHeight
+ "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 minHeight max: 5]
+ ifFalse: [super minHeight max: ((buttonCount * refExtent y) - (buttonCount-1 * refBorder))]!

Item was added:
+ ----- Method: ScrollBar>>minWidth (in category 'geometry') -----
+ minWidth
+ "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 minWidth max: ((buttonCount * refExtent x) - (buttonCount-1 * refBorder))]
+ ifFalse: [super minWidth max: 5]!

Item was removed:
- ----- Method: ScrollPane>>minExtent (in category 'geometry') -----
- minExtent
- "Answer the calculated minimum size of the receiver."
-
- ^ super minExtent max: self minScrollbarExtent!

Item was added:
+ ----- Method: ScrollPane>>minHeight (in category 'geometry') -----
+ minHeight
+
+ ^ super minHeight max: self minScrollbarExtent y!

Item was added:
+ ----- Method: ScrollPane>>minWidth (in category 'geometry') -----
+ minWidth
+
+ ^ super minWidth max: self minScrollbarExtent x!

Item was removed:
- ----- 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)]!

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

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