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

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

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

Name: Morphic-mt.1247
Author: mt
Time: 10 August 2016, 11:12:51.869966 am
UUID: 22978f95-f572-d24c-9271-7888b6f28466
Ancestors: Morphic-mt.1246

Adds small workaround for 64-bit builds. Only temporary.

=============== Diff against Morphic-mt.1246 ===============

Item was changed:
  ----- Method: DialogWindow>>setTitleParameters (in category 'initialization') -----
  setTitleParameters
 
  (self submorphNamed: #title) ifNotNil: [:title |
  title
  fillStyle: (self class gradientDialog
  ifFalse: [SolidFillStyle color: (self userInterfaceTheme titleColor ifNil: [Color r: 0.658 g: 0.678 b: 0.78])]
  ifTrue: [self titleGradientFor: title from: (self userInterfaceTheme titleColor ifNil: [Color r: 0.658 g: 0.678 b: 0.78])]);
  borderStyle: (self userInterfaceTheme titleBorderStyle ifNil: [BorderStyle default]);
  borderColor: (self userInterfaceTheme titleBorderColor ifNil: [Color r: 0.6 g: 0.7 b: 1]);
  borderWidth: (self userInterfaceTheme titleBorderWidth ifNil: [0]);
  cornerStyle: (self wantsRoundedCorners ifTrue: [#rounded] ifFalse: [#square]);
  vResizing: #shrinkWrap;
  hResizing: #spaceFill;
  wrapCentering: #center;
  cellPositioning: #center;
  cellInset: 0;
  layoutInset: (5@3 corner: 5@ (2+(self wantsRoundedCorners ifFalse: [0] ifTrue: [self cornerRadius])))].
 
  titleMorph ifNotNil: [
  | fontToUse colorToUse |
  fontToUse := self userInterfaceTheme titleFont ifNil: [TextStyle defaultFont].
  colorToUse := self userInterfaceTheme titleTextColor ifNil: [Color black].
 
+ "Temporary HACK for 64-bit CI build. Can be removed in the future."
+ titleMorph contents isText ifFalse: [^ self].
+
  titleMorph contents
  addAttribute: (TextFontReference toFont: fontToUse);
  addAttribute: (TextColor color: colorToUse).
  titleMorph releaseParagraph; changed].!