suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix autowrap bitmap drawing so it isn't covered up by a selection

Browse Source
This commit is contained in:
Matthew Flatt 2010-12-01 13:37:07 -07:00
parent 7d8c520480
commit e9710d08f5
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
collects/mred/private/wxme/text.rkt
View File

@ -5265,20 +5265,6 @@
(-startpos . > . (+ pcounter (mline-len line))))] (-startpos . > . (+ pcounter (mline-len line))))]
[(hilite-some? hsxs hsxe hsys hsye old-style) [(hilite-some? hsxs hsxe hsys hsye old-style)
(process-snips draw-first? #f old-style)]) (process-snips draw-first? #f old-style)])
(when (and (positive? wrap-bitmap-width)
(not (has-flag? (snip->flags (mline-last-snip line)) HARD-NEWLINE))
last
(rightx . >= . max-width)
(send auto-wrap-bitmap ok?))
(let ([h (min (->long (send auto-wrap-bitmap get-height))
(mline-bottombase line))]
[osfg (send old-style get-foreground)])
(send dc draw-bitmap-section
auto-wrap-bitmap
(sub1 (+ max-width dx)) (+ (- bottombase h) dy)
0 0 wrap-bitmap-width h
'solid osfg)))
(let ([prevwasfirst (let ([prevwasfirst
(if hilite-some? (if hilite-some?
(if (not (= hsxs hsxe)) (if (not (= hsxs hsxe))
@ -5337,6 +5323,21 @@
(send dc set-pen save-pen)))) (send dc set-pen save-pen))))
prevwasfirst)) prevwasfirst))
prevwasfirst)]) prevwasfirst)])
(when (and (positive? wrap-bitmap-width)
(not (has-flag? (snip->flags (mline-last-snip line)) HARD-NEWLINE))
last
(rightx . >= . max-width)
(send auto-wrap-bitmap ok?))
(let ([h (min (->long (send auto-wrap-bitmap get-height))
(mline-bottombase line))]
[osfg (send old-style get-foreground)])
(send dc draw-bitmap-section
auto-wrap-bitmap
(sub1 (+ max-width dx)) (+ (- bottombase h) dy)
0 0 wrap-bitmap-width h
'solid osfg)))
(let ([old-style (let ([old-style
(if draw-first? (if draw-first?
old-style old-style