hg/stx-libwidg: comparison ListView.st

equal deleted inserted replaced

-:219a28ca67d1
+:98bc0782ffa1
 "Created: / 25-07-2012 / 11:59:58 / cg"
 !
 getFontParameters
 "get some info of the used font. They are cached since we use them often ..
-The code below uses the fonts average height parameters - these
+The code below uses the font's average height parameters - these
 are not OK for some oversized national characters (such as A-dieresis).
 Therefore, this method should be redefined in views which will be used
 with national characters (i.e. editTextViews)."
 |hMax newDeviceFont|
 (fullWord not
 or:[ (self findBeginOfWordAtLine:lnr col:col) == col
 and:[ (self findEndOfWordAtLine:lnr col:col) == (col + patternSize - 1) ]]
 ) ifTrue:[
 (atBeginOfLineOnly not or:[col == 1]) ifTrue:[
-^ block1 value:lnr value:col.
+^ block1 value:lnr value:col optionalArgument:nil.
 ]
 ]
 ].
 col := col - 1.
 [(col > 0)
 !
 searchForwardUsingSpec:searchSpec startingAtLine:startLine col:startCol ifFound:block1 ifAbsent:block2
 "search for a pattern, if found evaluate block1 with row/col as arguments,
 if not found evaluate block2.
-If the block is a three-arg block, it gets the end-col (or nil, if not found)"
+If the block is a three-arg block, it gets the end-col (or nil, if not known)"
 |lineString col pattern match regexMatch ignCase fullWord atBeginOfLineOnly
 wrapAtEndOfText patternSize matcher lnr   "{Class: SmallInteger}"
 line1 "{Class: SmallInteger}"
 line2 "{Class: SmallInteger}"
 p realPattern runner foundCol endCol|
 pattern := searchSpec pattern.
 match := searchSpec match.
 regexMatch := searchSpec regexMatch.
+(match and:[regexMatch not]) ifTrue:[
+pattern := pattern globPatternAsRegexPattern.
+regexMatch := true.
+].
 ignCase := searchSpec ignoreCase.
 fullWord := searchSpec fullWord.
 atBeginOfLineOnly := searchSpec atBeginOfLineOnly.
 wrapAtEndOfText := searchSpec wrapAtEndOfText.
 foundCol >= col ifTrue:[
 (atBeginOfLineOnly not or:[foundCol == 1]) ifTrue:[
 ^ block1 value:lnr value:foundCol optionalArgument:endCol.
 ]]]]]].
 ] ifFalse:[
-(match and:[regexMatch or:[pattern includesUnescapedMatchCharacters]]) ifTrue:[
+(match and:[pattern includesUnescapedMatchCharacters]) ifTrue:[
 "perform a findMatchString (glob matching)"
 p := pattern species new:0.
 (pattern startsWith:$*) ifFalse:[p := p , '*'].
 p := p , pattern.
 (pattern endsWith:$*) ifFalse:[p := p , '*'].
 ^ block1 value:lnr value:foundCol optionalArgument:nil.
 ]]]].
 ] ifFalse:[
 "perform a findString (no matching)"
 p := pattern.
+(match and:[pattern includesMatchCharacters]) ifTrue:[
+p := pattern withoutMatchEscapes
+].
 runner
 value:[:lnr :col :lineString |
 foundCol := lineString
 findString:p startingAt:col ifAbsent:0 caseSensitive: ignCase not.
 foundCol ~~ 0 ifTrue:[
 atBeginOfLineOnly
 ^ atBeginOfLineOnly ? false
 !
-atBeginOfLineOnly:something
+atBeginOfLineOnly:aBoolean
-atBeginOfLineOnly := something.
+atBeginOfLineOnly := aBoolean.
 !
 forward
 ^ forward ? true
 !
 forward := forwardBoolean.
 atBeginOfLineOnly := atBeginOfLineOnlyArg
 !
 regexMatch
-^ regexMatch
+^ regexMatch ? false
 !
-regexMatch:something
+regexMatch:aBoolean
-regexMatch := something.
+regexMatch := aBoolean.
 !
 variable
 ^ variable
 !

branch	jv
changeset 5737	98bc0782ffa1
parent 5692	2fb164455e7c
parent 5721	93b70f144978
child 5760	9a0b5601b3f4