From 2bf3610a3322115763baaec8457df71f229fd12e Mon Sep 17 00:00:00 2001 From: fvogel Date: Tue, 26 Jul 2016 09:30:33 +0000 Subject: Fixed [5660d11c3f] - text tag -background option overrules -lmargincolor --- generic/tkTextDisp.c | 14 +++++++------- 1 file 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 -- cgit v0.12