[squeak-dev] The Trunk: Tools-MAD.132.mcz

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

[squeak-dev] The Trunk: Tools-MAD.132.mcz

commits-2
Andreas Raab uploaded a new version of Tools to project The Trunk:
http://source.squeak.org/trunk/Tools-MAD.132.mcz

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

Name: Tools-MAD.132
Author: MAD
Time: 6 October 2009, 7:42:56 am
UUID: baba47eb-d278-49c4-8aa9-65b4ae8b7198
Ancestors: Tools-ar.131

See also Morphic-MAD.204
Selection highlighting in lists is now consistent with that in menus. I've made direct reference to Preferences menuSelectionColor - not sure if this will be seen as reasonable?

You should really tone down the highlight colour after loading these changes:
Preferences setParameter: #menuSelectionColor to: (Color r: 0.4 g: 0.5 b: 0.7)


=============== Diff against Tools-ar.131 ===============

Item was changed:
  ----- Method: IndentingListItemMorph>>drawOn: (in category 'drawing') -----
  drawOn: aCanvas
 
+
+ | tRect sRect columnRect columnScanner columnData columnLeft  |
- | tRect sRect columnRect columnScanner columnData columnLeft colorToUse |
 
+
  tRect := self toggleRectangle.
+
  sRect := bounds withLeft: tRect right + 4.
  self drawToggleOn: aCanvas in: tRect.
- colorToUse := complexContents preferredColor ifNil: [color].
 
  icon isNil ifFalse:[
  aCanvas
  translucentImage: icon
+
  at: sRect left @ (self top + (self height - icon height // 2)).
+
 
  sRect := sRect left: sRect left + icon width + 2.
  ].
 
  (container columns isNil or: [(contents asString indexOf: Character tab) = 0]) ifTrue: [
  sRect := sRect top: sRect top + sRect bottom - self fontToUse height // 2.
+ aCanvas drawString: contents asString in: sRect font: self fontToUse color: color.
+
- aCanvas drawString: contents asString in: sRect font: self fontToUse color: colorToUse.
  ] ifFalse: [
  columnLeft := sRect left.
  columnScanner := ReadStream on: contents asString.
  container columns do: [ :width |
  columnRect := columnLeft @ sRect top extent: width @ sRect height.
  columnData := columnScanner upTo: Character tab.
  columnData isEmpty ifFalse: [
+ aCanvas drawString: columnData in: columnRect font: self fontToUse color: color
+ .
- aCanvas drawString: columnData in: columnRect font: self fontToUse color: colorToUse.
  ].
  columnLeft := columnRect right + 5.
  ].
  ]
  !