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

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

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

Name: Morphic-mt.1130
Author: mt
Time: 2 May 2016, 6:21:01.941556 pm
UUID: 2f1c4303-1ffe-6045-8d64-e8ae3640dba5
Ancestors: Morphic-mt.1129

Fixes list filter highlight. The filter is case-insensitive and the highlight did not consider this.

=============== Diff against Morphic-mt.1129 ===============

Item was changed:
  ----- Method: LazyListMorph>>getFilterOffsets: (in category 'list access') -----
  getFilterOffsets: row
  "Calculate matching character indexes for the current filter term."
 
+ | item filter offsets currentIndex |
- | item filter filterWidth offsets currentIndex |
  filter := listSource filterTerm.
  filter ifEmpty: [^ Array empty].
- filterWidth := font widthOfString: filter.
 
  item := (self item: row) asStringOrText asString. "See row drawing. Strings only."
  offsets := OrderedCollection new.
 
  currentIndex := 1.
  [currentIndex > 0] whileTrue: [
  currentIndex := item findString: filter startingAt: currentIndex caseSensitive: false.
+ currentIndex > 0 ifTrue: [ | left width |
- currentIndex > 0 ifTrue: [ | left |
  left := font widthOfString: item from: 1 to: currentIndex-1.
+ width := font widthOfString: item from: currentIndex to: currentIndex + filter size - 1.
+ offsets addLast: (left to: left + width).
- offsets addLast: (left to: left + filterWidth).
  currentIndex := currentIndex + 1] ].
  ^ offsets!