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

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

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

Name: Morphic-mt.1297
Author: mt
Time: 24 August 2016, 9:34:22.478086 am
UUID: 4851a423-b544-174b-b6c7-0ecef50f1009
Ancestors: Morphic-mt.1296

Reduced use of deprecated API. Custom UI theme colors for halo morph and its rubber selection.

=============== Diff against Morphic-mt.1296 ===============

Item was changed:
  ----- Method: MorphHierarchyListMorph>>createContainer (in category 'private') -----
  createContainer
  "Private - Create a container"
  | container |
  container := BorderedMorph new.
  container extent: (World extent * (1 / 4 @ (2 / 3))) rounded.
  container layoutPolicy: TableLayout new.
  container hResizing: #rigid.
  container vResizing: #rigid.
  container
+ setColor: (Color gray: 0.9)
+ borderWidth: 1
+ borderColor: Color gray.
- setColor: MenuMorph menuColor
- borderWidth: MenuMorph menuBorderWidth
- borderColor: MenuMorph menuBorderColor.
  container layoutInset: 0.
  "container useRoundedCorners."
  ""
  container setProperty: #morphHierarchy toValue: true.
  container setNameTo: 'Objects Hierarchy' translated.
  ""
  ^ container!

Item was changed:
  ----- Method: SelectionMorph>>defaultBorderColor (in category 'initialization') -----
  defaultBorderColor
  "answer the default border color/fill style for the receiver"
+ ^ self userInterfaceTheme borderColor ifNil: [Color blue twiceDarker alpha: 0.75]!
- ^ ( MenuMorph menuSelectionColor ifNil: [Color blue]) twiceDarker alpha: 0.75!

Item was changed:
  ----- Method: SelectionMorph>>defaultColor (in category 'initialization') -----
  defaultColor
  "answer the default color/fill style for the receiver"
+ ^ self userInterfaceTheme color ifNil: [Color blue alpha: 0.08]
- ^ (MenuMorph menuSelectionColor ifNil: [Color blue]) alpha: 0.08
  !

Item was changed:
  ----- Method: SimpleHaloMorph>>drawOn: (in category 'drawing') -----
  drawOn: aCanvas
  "Draw this morph only if it has no target."
 
  (Preferences showBoundsInHalo and: [self target isWorldMorph not])
  ifTrue: [
- | boundsColor |
- boundsColor := MenuMorph menuSelectionColor
- ifNil: [Color blue].
  aCanvas
  frameAndFillRectangle: self bounds
  fillColor: Color transparent
  borderWidth: 2
+ borderColor: (self userInterfaceTheme borderColor ifNil: [Color blue alpha: 0.8])]!
- borderColor:
- (boundsColor isTranslucent
- ifTrue: [boundsColor]
- ifFalse: [boundsColor alpha: 0.8])]!

Item was changed:
  ----- Method: TheWorldMainDockingBar>>colorIcon: (in category 'private') -----
  colorIcon: aColor
 
  "Guess if 'uniform window colors' are used and avoid all icons to be just gray"
  (aColor = (UserInterfaceTheme current get: #uniformWindowColor for: Model) or: [Preferences tinyDisplay]) ifTrue: [ ^nil ].
  ^(aColor iconOrThumbnailOfSize: 14)
+ borderWidth: 3 color: ((UserInterfaceTheme current get: #color for: #MenuMorph) ifNil: [(Color r: 0.9 g: 0.9 b: 0.9)]) muchDarker;
- borderWidth: 3 color: MenuMorph menuColor muchDarker;
  borderWidth: 2 color: Color transparent!

Item was removed:
- ----- Method: TheWorldMainDockingBar>>gradientRamp (in category 'private') -----
- gradientRamp
-
- ^{
- 0.0 -> Color white.
- 1.0 -> MenuMorph menuColor darker }!