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

use the standard editor style to get the right colors in the line

Browse Source 
numbers mixin. closes pr11655

original commit: 5bb72d5b0e01d022ce49ad360bc1333029c0ea56
This commit is contained in:
Jon Rafkind 2011-02-09 12:07:46 -07:00
parent c830b5a1bc
commit 3848e3da6c
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
collects/framework/private/text.rkt
View File

@ -3720,7 +3720,7 @@ designates the character that triggers autocompletion
;; draws line numbers on the left hand side of a text% object ;; draws line numbers on the left hand side of a text% object
(define line-numbers-mixin (define line-numbers-mixin
(mixin ((class->interface text%)) (line-numbers<%>) (mixin ((class->interface text%) editor:standard-style-list<%>) (line-numbers<%>)
(inherit get-visible-line-range (inherit get-visible-line-range
get-visible-position-range get-visible-position-range
last-line last-line
@ -3732,7 +3732,7 @@ designates the character that triggers autocompletion
set-padding set-padding
get-padding) get-padding)
(init-field [line-numbers-color "black"]) (init-field [line-numbers-color #f])
(init-field [show-line-numbers? #t]) (init-field [show-line-numbers? #t])
;; whether the numbers are aligned on the left or right ;; whether the numbers are aligned on the left or right
;; only two values should be 'left or 'right ;; only two values should be 'left or 'right
@ -3774,9 +3774,12 @@ designates the character that triggers autocompletion
(define style-change-notify (define style-change-notify
(lambda (style) (unless style (setup-padding)))) (lambda (style) (unless style (setup-padding))))
(define/private (get-style-font) (define/private (get-style)
(let* ([style-list (send this get-style-list)] (let* ([style-list (editor:get-standard-style-list)]
[std (or (send style-list find-named-style "Standard") [std (or (send style-list
find-named-style
(editor:get-default-color-style-name))
(send style-list find-named-style "Standard")
(send style-list basic-style))]) (send style-list basic-style))])
;; If the style changes, we should re-check the width of ;; If the style changes, we should re-check the width of
;; drawn line numbers: ;; drawn line numbers:
@ -3785,8 +3788,13 @@ designates the character that triggers autocompletion
(send style-list notify-on-change style-change-notify) (send style-list notify-on-change style-change-notify)
;; Avoid registering multiple notifications: ;; Avoid registering multiple notifications:
(set! notify-registered-in-list style-list)) (set! notify-registered-in-list style-list))
;; Extract the font from the style: std))
(send std get-font)))
(define/private (get-style-foreground)
(send (get-style) get-foreground))
(define/private (get-style-font)
(send (get-style) get-font))
(define-struct saved-dc-state (pen font foreground-color)) (define-struct saved-dc-state (pen font foreground-color))
(define/private (save-dc-state dc) (define/private (save-dc-state dc)
@ -3799,11 +3807,16 @@ designates the character that triggers autocompletion
(send dc set-font (saved-dc-state-font dc-state)) (send dc set-font (saved-dc-state-font dc-state))
(send dc set-text-foreground (saved-dc-state-foreground-color dc-state))) (send dc set-text-foreground (saved-dc-state-foreground-color dc-state)))
(define/private (get-foreground)
(if line-numbers-color
(make-object color% line-numbers-color)
(get-style-foreground)))
;; set the dc stuff to values we want ;; set the dc stuff to values we want
(define/private (setup-dc dc) (define/private (setup-dc dc)
(send dc set-pen "black" 1 'solid) (send dc set-pen "black" 1 'solid)
(send dc set-font (get-style-font)) (send dc set-font (get-style-font))
(send dc set-text-foreground (make-object color% line-numbers-color))) (send dc set-text-foreground (get-foreground)))
(define/private (lighter-color color) (define/private (lighter-color color)
(define (integer number) (define (integer number)
@ -3914,7 +3927,7 @@ designates the character that triggers autocompletion
(begin (begin
(send dc set-text-foreground (lighter-color (send dc get-text-foreground))) (send dc set-text-foreground (lighter-color (send dc get-text-foreground)))
(draw-text view final-x final-y) (draw-text view final-x final-y)
(send dc set-text-foreground (make-object color% line-numbers-color))) (send dc set-text-foreground (get-foreground)))
(draw-text view final-x final-y))) (draw-text view final-x final-y)))
(set! last-paragraph (line-paragraph line)))) (set! last-paragraph (line-paragraph line))))