diff options
author | fvogel <fvogelnew1@free.fr> | 2016-07-26 09:30:33 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2016-07-26 09:30:33 (GMT) |
commit | a3c45f31ff3a87492aacbf91fa1730d25b969e19 (patch) | |
tree | e58595c74c05e581d794a248a9703d958095f8a3 /generic/tkTextDisp.c | |
parent | 9c557fdb9b18eb0970314696af5a842f0f4aae6e (diff) | |
download | tk-a3c45f31ff3a87492aacbf91fa1730d25b969e19.zip tk-a3c45f31ff3a87492aacbf91fa1730d25b969e19.tar.gz tk-a3c45f31ff3a87492aacbf91fa1730d25b969e19.tar.bz2 |
Fixed [5660d11c3f] - text tag -background option overrules -lmargincolor
Diffstat (limited to 'generic/tkTextDisp.c')
-rw-r--r-- | generic/tkTextDisp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 81bce94..a135084 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -2464,7 +2464,13 @@ DisplayDLine( Tk_Width(textPtr->tkwin), dlPtr->height, 0, TK_RELIEF_FLAT); /* - * Second, draw the background color of the left and right margins. + * Second, draw background information for the whole line. + */ + + DisplayLineBackground(textPtr, dlPtr, prevPtr, pixmap); + + /* + * Third, draw the background color of the left and right margins. */ if (dlPtr->lMarginColor != NULL) { Tk_Fill3DRectangle(textPtr->tkwin, pixmap, dlPtr->lMarginColor, 0, y, @@ -2478,12 +2484,6 @@ DisplayDLine( } /* - * Next, draw background information for the whole line. - */ - - DisplayLineBackground(textPtr, dlPtr, prevPtr, pixmap); - - /* * Make another pass through all of the chunks to redraw the insertion * cursor, if it is visible on this line. Must do it here rather than in * the foreground pass below because otherwise a wide insertion cursor |