The Trunk: Morphic-tpr.1069.mcz

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

The Trunk: Morphic-tpr.1069.mcz

commits-2
tim Rowledge uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-tpr.1069.mcz

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

Name: Morphic-tpr.1069
Author: tpr
Time: 19 January 2016, 2:00:10.351434 pm
UUID: 080b7719-2b70-419c-91f3-4842337058a6
Ancestors: Morphic-mt.1068, Morphic-tpr.1068

This seems to be the best way to make sure that the preference 'cmd gestures enabled' being false results in no Halos.

If you have a nicer way, please replace this.

=============== Diff against Morphic-mt.1068 ===============

Item was changed:
  ----- Method: Morph>>handleMouseDown: (in category 'events-processing') -----
  handleMouseDown: anEvent
  "System level event handling."
  anEvent wasHandled ifTrue:[^self]. "not interested"
  anEvent hand removePendingBalloonFor: self.
  anEvent hand removePendingHaloFor: self.
  anEvent wasHandled: true.
 
  (anEvent controlKeyPressed
  and: [anEvent blueButtonChanged not
  and: [Preferences cmdGesturesEnabled]])
  ifTrue: [^ self invokeMetaMenu: anEvent].
 
  "Make me modal during mouse transitions"
  anEvent hand newMouseFocus: self event: anEvent.
+ (anEvent blueButtonChanged and:[Preferences cmdGesturesEnabled]) ifTrue:[^self blueButtonDown: anEvent].
- anEvent blueButtonChanged ifTrue:[^self blueButtonDown: anEvent].
 
  "this mouse down could be the start of a gesture, or the end of a gesture focus"
  (self isGestureStart: anEvent)
  ifTrue: [^ self gestureStart: anEvent].
 
  "Filter events sent to the subwidgets of non-MorphicModels in inactive windows, if they are not supposed to receive them due to windowActiveOnFirstClick being set to false.  I don't like having this check for owningWindow here, is there another way?"
  SystemWindow allWindowsAcceptInput
  ifTrue:
  [ self owningWindow
  ifNil: [ self mouseDown: anEvent ]
  ifNotNil:
  [ : owningWindow |
  (owningWindow canProcessMouseDown: anEvent)
  ifTrue: [ self mouseDown: anEvent ]
  ifFalse: [ owningWindow activate ] ] ]
  ifFalse: [ self mouseDown: anEvent ].
 
  Preferences maintainHalos
  ifFalse:[ anEvent hand removeHaloFromClick: anEvent on: self ].
 
  (self handlesMouseStillDown: anEvent) ifTrue:[
  self startStepping: #handleMouseStillDown:
  at: Time millisecondClockValue + self mouseStillDownThreshold
  arguments: {anEvent copy resetHandlerFields}
  stepTime: self mouseStillDownStepRate ].
  !


Reply | Threaded
Open this post in threaded view
|

Re: The Trunk: Morphic-tpr.1069.mcz

Chris Muller-3
Does it still work correctly if you toggle your swapMouseButtons setting?

On Tue, Jan 19, 2016 at 4:00 PM,  <[hidden email]> wrote:

> tim Rowledge uploaded a new version of Morphic to project The Trunk:
> http://source.squeak.org/trunk/Morphic-tpr.1069.mcz
>
> ==================== Summary ====================
>
> Name: Morphic-tpr.1069
> Author: tpr
> Time: 19 January 2016, 2:00:10.351434 pm
> UUID: 080b7719-2b70-419c-91f3-4842337058a6
> Ancestors: Morphic-mt.1068, Morphic-tpr.1068
>
> This seems to be the best way to make sure that the preference 'cmd gestures enabled' being false results in no Halos.
>
> If you have a nicer way, please replace this.
>
> =============== Diff against Morphic-mt.1068 ===============
>
> Item was changed:
>   ----- Method: Morph>>handleMouseDown: (in category 'events-processing') -----
>   handleMouseDown: anEvent
>         "System level event handling."
>         anEvent wasHandled ifTrue:[^self]. "not interested"
>         anEvent hand removePendingBalloonFor: self.
>         anEvent hand removePendingHaloFor: self.
>         anEvent wasHandled: true.
>
>         (anEvent controlKeyPressed
>                         and: [anEvent blueButtonChanged not
>                                 and: [Preferences cmdGesturesEnabled]])
>                 ifTrue: [^ self invokeMetaMenu: anEvent].
>
>         "Make me modal during mouse transitions"
>         anEvent hand newMouseFocus: self event: anEvent.
> +       (anEvent blueButtonChanged and:[Preferences cmdGesturesEnabled]) ifTrue:[^self blueButtonDown: anEvent].
> -       anEvent blueButtonChanged ifTrue:[^self blueButtonDown: anEvent].
>
>         "this mouse down could be the start of a gesture, or the end of a gesture focus"
>         (self isGestureStart: anEvent)
>                 ifTrue: [^ self gestureStart: anEvent].
>
>         "Filter events sent to the subwidgets of non-MorphicModels in inactive windows, if they are not supposed to receive them due to windowActiveOnFirstClick being set to false.  I don't like having this check for owningWindow here, is there another way?"
>         SystemWindow allWindowsAcceptInput
>                 ifTrue:
>                         [ self owningWindow
>                                 ifNil: [ self mouseDown: anEvent ]
>                                 ifNotNil:
>                                         [ : owningWindow |
>                                         (owningWindow canProcessMouseDown: anEvent)
>                                                 ifTrue: [ self mouseDown: anEvent ]
>                                                 ifFalse: [ owningWindow activate ] ] ]
>                 ifFalse: [ self mouseDown: anEvent ].
>
>         Preferences maintainHalos
>                 ifFalse:[ anEvent hand removeHaloFromClick: anEvent on: self ].
>
>         (self handlesMouseStillDown: anEvent) ifTrue:[
>                 self startStepping: #handleMouseStillDown:
>                         at: Time millisecondClockValue + self mouseStillDownThreshold
>                         arguments: {anEvent copy resetHandlerFields}
>                         stepTime: self mouseStillDownStepRate ].
>   !
>
>

Reply | Threaded
Open this post in threaded view
|

Re: The Trunk: Morphic-tpr.1069.mcz

timrowledge

> On 19-01-2016, at 6:24 PM, Chris Muller <[hidden email]> wrote:
>
> Does it still work correctly if you toggle your swapMouseButtons setting?

Yup. The bit flags are swapped at a very low level and thus blue-button stuff stays the same.


tim
--
tim Rowledge; [hidden email]; http://www.rowledge.org/tim
Strange OpCodes: SSAN: Stop, and See if Anyone Notices