The Trunk: ST80-fbs.146.mcz

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

The Trunk: ST80-fbs.146.mcz

commits-2
Frank Shearar uploaded a new version of ST80 to project The Trunk:
http://source.squeak.org/trunk/ST80-fbs.146.mcz

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

Name: ST80-fbs.146
Author: fbs
Time: 9 July 2013, 10:09:58.467 pm
UUID: 199f853b-126a-8546-a700-470d7e81a4c2
Ancestors: ST80-fbs.145

Make things use Cursor currentCursor (because InputSensor >> #currentCursor delegates to it anyway).

=============== Diff against ST80-fbs.145 ===============

Item was changed:
  SystemOrganization addCategory: #'ST80-Controllers'!
  SystemOrganization addCategory: #'ST80-Editors'!
  SystemOrganization addCategory: #'ST80-Framework'!
  SystemOrganization addCategory: #'ST80-Menus'!
  SystemOrganization addCategory: #'ST80-Menus-Tests'!
  SystemOrganization addCategory: #'ST80-Paths'!
  SystemOrganization addCategory: #'ST80-Pluggable Views'!
  SystemOrganization addCategory: #'ST80-Support'!
  SystemOrganization addCategory: #'ST80-Support-Tests'!
  SystemOrganization addCategory: #'ST80-Symbols'!
- SystemOrganization addCategory: #'ST80-Views'!
  SystemOrganization addCategory: #'ST80-ToolBuilder'!
+ SystemOrganization addCategory: #'ST80-Views'!

Item was changed:
  ----- Method: ScrollController>>changeCursor: (in category 'cursor') -----
  changeCursor: aCursor
  "The current cursor should be set to be aCursor."
 
+ Cursor currentCursor ~~ aCursor ifTrue: [aCursor show]!
- sensor currentCursor ~~ aCursor ifTrue: [aCursor show]!

Item was changed:
  ----- Method: ScrollController>>scroll (in category 'scrolling') -----
  scroll
  "Check to see whether the user wishes to jump, scroll up, or scroll down."
  | savedCursor |
+ savedCursor := Cursor currentCursor.
- savedCursor := sensor currentCursor.
  [self scrollBarContainsCursor]
  whileTrue:
  [self interActivityPause.
  sensor cursorPoint x <= self downLine
  ifTrue: [self scrollDown]
  ifFalse: [sensor cursorPoint x <= self upLine
  ifTrue: [self scrollAbsolute]
  ifFalse: [sensor cursorPoint x <= self yellowLine
  ifTrue: [self scrollUp]
  ifFalse: [sensor cursorPoint x <= scrollBar right
  ifTrue: "Might not be, with touch pen"
  [self changeCursor: Cursor menu.
  sensor anyButtonPressed
  ifTrue: [self changeCursor: savedCursor.
  self anyButtonActivity]]]]]].
  savedCursor show!