steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui.backend.cocoa.views: some formatting cleanup.

master
John Benediktsson 2020-01-24 14:47:42 -08:00
parent fb3928f807
commit a62ea78d73
1 changed files with 151 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
basis/ui/backend/cocoa/views/views.factor
View File

@ -238,7 +238,7 @@ IMPORT: NSAttributedString
] [ underlines ] if ; ] [ underlines ] if ;
:: update-marked-text ( gadget str selectedRange replacementRange -- ) :: update-marked-text ( gadget str selectedRange replacementRange -- )
replacementRange location>> NSNotFound = not [ replacementRange location>> NSNotFound = [
gadget editor-caret first gadget editor-caret first
dup gadget editor-line dup gadget editor-line
[ [
@ -253,7 +253,7 @@ IMPORT: NSAttributedString
gadget earlier-caret/mark dup gadget earlier-caret/mark dup
gadget preedit-start<< gadget preedit-start<<
0 1 2array v+ gadget preedit-end<< 0 1 2array v+ gadget preedit-end<<
] when ] unless
gadget preedit? [ gadget preedit? [
gadget remove-preedit-text gadget remove-preedit-text
@ -483,7 +483,8 @@ PRIVATE>
] 2bi ] 2bi
] unless ] unless
gadget preedit? [ gadget preedit? [
gadget [ remove-preedit-text ] [ remove-preedit-info ] bi gadget remove-preedit-text
gadget remove-preedit-info
str gadget user-input* drop str gadget user-input* drop
f gadget preedit-selection-mode?<< f gadget preedit-selection-mode?<<
] [ ] [
@ -501,7 +502,7 @@ PRIVATE>
window [ window [
window world-focus :> gadget window world-focus :> gadget
gadget [ gadget [
gadget preedit? [ 1 ] [ 0 ] if gadget preedit? 1 0 ?
] [ 0 ] if ] [ 0 ] if
] [ 0 ] if ] [ 0 ] if
] ; ] ;
@ -512,15 +513,13 @@ PRIVATE>
window world-focus :> gadget window world-focus :> gadget
gadget [ gadget [
gadget preedit? [ gadget preedit? [
gadget [ preedit-start>> second ] [ preedit-end>> second ] bi >= [ gadget preedit-start>> second
NSNotFound 0 gadget preedit-end>> second < [
] [
gadget preedit-start>> first gadget editor-line :> str gadget preedit-start>> first gadget editor-line :> str
gadget gadget preedit-start>> second ! location
[ preedit-start>> second ] ! location gadget preedit-end>> second
[ preedit-end>> second ] [ str swap >utf16-index ] bi@ over - ! length
bi [ str swap >utf16-index ] bi@ over - ! length ] [ NSNotFound 0 ] if
] if
] [ NSNotFound 0 ] if ] [ NSNotFound 0 ] if
] [ NSNotFound 0 ] if ] [ NSNotFound 0 ] if
] [ NSNotFound 0 ] if ] [ NSNotFound 0 ] if
@ -536,14 +535,12 @@ PRIVATE>
gadget editor-caret first gadget editor-line :> str gadget editor-caret first gadget editor-line :> str
gadget preedit? [ gadget preedit? [
str str
gadget gadget preedit-selected-start>> second
[ preedit-selected-start>> second ] gadget preedit-start>> second
[ preedit-start>> second ] - >utf16-index ! location
bi - >utf16-index ! location gadget preedit-selected-end>> second
gadget gadget preedit-selected-start>> second
[ preedit-selected-end>> second ] [ str swap >utf16-index ] bi@ - ! length
[ preedit-selected-start>> second ]
bi [ str swap >utf16-index ] bi@ - ! length
] [ ] [
str gadget editor-caret second >utf16-index 0 str gadget editor-caret second >utf16-index 0
] if ] if
@ -587,9 +584,11 @@ PRIVATE>
gadget { gadget {
[ preedit-start>> second ] [ preedit-start>> second ]
[ preedit-end>> second ] [ preedit-end>> second ]
[ preedit-start>> first ] [ editor-line ] [ preedit-start>> first ]
[ editor-line ]
} cleave subseq } cleave subseq
gadget [ remove-preedit-text ] [ remove-preedit-info ] bi gadget remove-preedit-text
gadget remove-preedit-info
gadget user-input* drop gadget user-input* drop
] when ] when
f gadget preedit-selection-mode?<< f gadget preedit-selection-mode?<<