The Trunk: Morphic-eem.1062.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-eem.1062.mcz

commits-2
Eliot Miranda uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-eem.1062.mcz

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

Name: Morphic-eem.1062
Author: eem
Time: 5 January 2016, 12:10:11.093556 pm
UUID: ea1e73ed-1c23-44b1-9651-8f12c608107f
Ancestors: Morphic-mt.1061

Drop SystemProgressMorph's direect access of the soon-to-be-obsolete millisecond clock.

=============== Diff against Morphic-mt.1061 ===============

Item was removed:
- ----- Method: SystemProgressMorph>>label:min:max: (in category 'private') -----
- label: shortDescription min: minValue max: maxValue
- | slot range barSize lastRefresh |
- "This method is no longer used, but kept for a while longer to ensure no difficulties updating via the trunk."
- ((range := maxValue - minValue) < 0 or: [(slot := self nextSlotFor: shortDescription) = 0])
- ifTrue: [^[:barVal| 0 ]].
- range <= 0 ifTrue: [self removeMorph: (bars at: slot)].
- self recenter.
- self openInWorld.
- barSize := -1. "Enforces a inital draw of the morph"
- lastRefresh := 0.
- ^[:barVal | | newBarSize |
- barVal isString ifTrue: [
- self setLabel: barVal at: slot.
- self currentWorld displayWorld].
- (barVal isNumber and: [range >= 1 and: [barVal between: minValue and: maxValue]]) ifTrue: [
- newBarSize := (barVal - minValue / range * BarWidth) truncated.
- newBarSize = barSize ifFalse: [
- barSize := newBarSize.
- (bars at: slot) barSize: barSize.
- Time primMillisecondClock - lastRefresh > 25 ifTrue: [
- self currentWorld displayWorld.
- lastRefresh := Time primMillisecondClock]]].
- slot]
- !

Item was changed:
  ----- Method: SystemProgressMorph>>position:label:min:max: (in category 'private') -----
  position: aPoint label: shortDescription min: minValue max: maxValue
  | slot range barSize lastRefresh |
  requestedPosition := aPoint.
  ((range := maxValue - minValue) < 0 or: [(slot := self nextSlotFor: shortDescription) = 0])
  ifTrue: [^[:barVal| 0 ]].
  range <= 0 ifTrue: [self removeMorph: (bars at: slot)].
  self reposition.
  self openInWorld.
  barSize := -1. "Enforces a inital draw of the morph"
  lastRefresh := 0.
  ^[:barVal | | newBarSize |
  barVal isString ifTrue: [
  self setLabel: barVal at: slot.
  self currentWorld displayWorld].
  (barVal isNumber and: [range >= 1 and: [barVal between: minValue and: maxValue]]) ifTrue: [
  newBarSize := (barVal - minValue / range * BarWidth) truncated.
  newBarSize = barSize ifFalse: [
  barSize := newBarSize.
  (bars at: slot) barSize: barSize.
+ Time utcMicrosecondClock - lastRefresh > 25000 ifTrue: [
- Time primMillisecondClock - lastRefresh > 25 ifTrue: [
  self currentWorld displayWorld.
+ lastRefresh := Time utcMicrosecondClock]]].
+ slot]!
- lastRefresh := Time primMillisecondClock]]].
- slot]
- !