[Pkg] The Trunk: Morphic-ar.425.mcz
commits at source.squeak.org
commits at source.squeak.org
Thu Apr 22 04:03:51 UTC 2010
Andreas Raab uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-ar.425.mcz
==================== Summary ====================
Name: Morphic-ar.425
Author: ar
Time: 21 April 2010, 9:02:14.798 pm
UUID: 57737e3f-e14d-2745-acc6-0c25366c36cb
Ancestors: Morphic-nice.424, Morphic-tfel.422
Merging Morphic-tfel.422:
Worked on the button gradients to make them less pronounced.
=============== Diff against Morphic-nice.424 ===============
Item was changed:
----- Method: PluggableButtonMorph>>drawOn: (in category 'drawing') -----
drawOn: aCanvas
+ | cc gradient borderColor |
- | cc gradient |
cc := self color.
cc isTransparent ifTrue:[cc := Color gray: 0.9].
self enabled ifFalse:[cc := Color lightGray].
cc brightness > 0.9 ifTrue:[cc := cc adjustBrightness: 0.9 - cc brightness].
showSelectionFeedback ifTrue:[
+ borderColor := cc 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.
- 0 -> (Color gray: 0.75).
- 0.5 -> (Color gray: 0.85).
- 0.51 -> (Color gray: 0.9).
- 1 -> (Color gray: 1).
}.
] ifFalse:[
+ borderColor := Color lightGray.
gradient := GradientFillStyle ramp: {
0.0 -> Color white.
+ 0.1-> (cc adjustBrightness: 0.05).
+ 0.6 -> (cc darker).
- 0.5 -> (cc).
- 0.51-> (cc adjustBrightness: -0.1).
- 1 -> (Color gray: 0.95).
}
].
gradient origin: bounds topLeft.
gradient direction: 0 at self height.
^ self class roundedButtonCorners
+ ifTrue: [aCanvas
+ frameAndFillRoundRect: bounds
+ radius: 8
+ fillStyle: gradient
+ borderWidth: 1
+ borderColor: borderColor]
+ ifFalse: [aCanvas
+ frameAndFillRectangle: self innerBounds
+ fillColor: gradient asColor
+ borderWidth: 1
+ borderColor: borderColor darker;
+ fillRectangle: (self innerBounds insetBy: 1)
+ fillStyle: gradient]!
- ifTrue: [aCanvas frameAndFillRoundRect: bounds radius: 8 fillStyle: gradient borderWidth: 1 borderColor: Color lightGray]
- ifFalse: [
- aCanvas
- frameAndFillRectangle: self innerBounds fillColor: gradient asColor borderWidth: 1 borderColor: Color gray;
- fillRectangle: (self innerBounds insetBy: 1) fillStyle: gradient]!
Item was changed:
+ (PackageInfo named: 'Morphic') postscript: '(Preferences dictionaryOfPreferences at: #alternativeWindowBoxesLook) defaultValue: false.
+ SystemProgressMorph initialize; reset'!
- (PackageInfo named: 'Morphic') postscript: 'SystemProgressMorph initialize; reset'!
More information about the Packages
mailing list