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

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

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

Name: Morphic-mt.1216
Author: mt
Time: 31 July 2016, 11:47:41.295418 am
UUID: 2829bb9f-b521-ec45-9252-77d6143b9dd5
Ancestors: Morphic-mt.1215

Small fix for the button border that was not updated correctly once a disabled button got enabled again.

=============== Diff against Morphic-mt.1215 ===============

Item was changed:
  ----- Method: PluggableButtonMorph>>updateFillStylePressing:hovering: (in category 'updating') -----
  updateFillStylePressing: isPressing hovering: isHovering
 
  | gradient cc |
  "Migrate old instances."
  hoverColor ifNil: [hoverColor := onColor darker].
 
  self labelOffset: (isPressing ifTrue: [1@1] ifFalse: [0@0]).
 
  self getModelState
  ifTrue: [self color: onColor]
  ifFalse: [self color: offColor].
+ self borderStyle color: borderColor.
- self borderColor: borderColor.
 
  self class gradientButton ifFalse: [
  isPressing ifTrue: [
  self color: feedbackColor.
+ self borderStyle color: feedbackColor muchDarker].
- self borderColor: feedbackColor muchDarker].
  isHovering ifTrue: [
  self color: hoverColor.
+ self borderStyle color: borderColor].
- self borderColor: borderColor].
  ^ self].
 
  isPressing ifTrue: [
  cc := feedbackColor.
  self borderColor: feedbackColor muchDarker.
  gradient := GradientFillStyle ramp: {
  0.0 -> cc muchDarker.
  0.1-> (cc adjustBrightness: -0.2).
  0.5 -> cc.
  0.9-> (cc adjustBrightness: -0.1).
  1 -> cc muchDarker}].
  isHovering ifTrue: [
  cc := hoverColor.
  gradient := GradientFillStyle ramp: {
  0.0 -> Color white.
  0.1-> (cc adjustBrightness: 0.05).
  0.6 -> (cc darker)}].
  gradient ifNil: [
  cc := self color.
  gradient := GradientFillStyle ramp: {
  0.0 -> Color white.
  0.1-> (cc adjustBrightness: 0.05).
  0.6 -> (cc darker)}].
 
  gradient origin: bounds topLeft.
  gradient direction: 0@self height.
 
  self fillStyle: gradient.!