summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-07-26 14:01:25 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-07-26 14:01:25 (GMT)
commiteb65815457a34d2abd06978ab3574cce83bbd5d8 (patch)
tree9d28a785329a0004dfeb4e4c6104021607591ebc
parent4e584f1fd1e96e38a316594fe756055ca93cbeb5 (diff)
parentb55b9243350f8b3a124afbd3974711593091184f (diff)
downloadtk-eb65815457a34d2abd06978ab3574cce83bbd5d8.zip
tk-eb65815457a34d2abd06978ab3574cce83bbd5d8.tar.gz
tk-eb65815457a34d2abd06978ab3574cce83bbd5d8.tar.bz2
merge 8.6
-rw-r--r--generic/tkTextDisp.c14
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