diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-03-20 08:28:05 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-03-20 08:28:05 (GMT) |
| commit | b4abdd32dc38e68821cd275612807542ed90b299 (patch) | |
| tree | 3866d51bb2a0e08acdbf78404a5920173f166363 /generic/tkText.c | |
| parent | 8713bf10789dfdd49d7d759621813c9321182f9e (diff) | |
| download | tk-b4abdd32dc38e68821cd275612807542ed90b299.zip tk-b4abdd32dc38e68821cd275612807542ed90b299.tar.gz tk-b4abdd32dc38e68821cd275612807542ed90b299.tar.bz2 | |
Merged tip-443 following acceptation of the TIP by TCT vote (cherrypicked [cb3354b298])
Diffstat (limited to 'generic/tkText.c')
| -rw-r--r-- | generic/tkText.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/generic/tkText.c b/generic/tkText.c index 5f87606..76251c0 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -2253,12 +2253,20 @@ ConfigureText( * replaced in the widget record. */ - textPtr->selTagPtr->border = textPtr->selBorder; + if (textPtr->selTagPtr->selBorder == NULL) { + textPtr->selTagPtr->border = textPtr->selBorder; + } else { + textPtr->selTagPtr->selBorder = textPtr->selBorder; + } if (textPtr->selTagPtr->borderWidthPtr != textPtr->selBorderWidthPtr) { textPtr->selTagPtr->borderWidthPtr = textPtr->selBorderWidthPtr; textPtr->selTagPtr->borderWidth = textPtr->selBorderWidth; } - textPtr->selTagPtr->fgColor = textPtr->selFgColorPtr; + if (textPtr->selTagPtr->selFgColor == NULL) { + textPtr->selTagPtr->fgColor = textPtr->selFgColorPtr; + } else { + textPtr->selTagPtr->selFgColor = textPtr->selFgColorPtr; + } textPtr->selTagPtr->affectsDisplay = 0; textPtr->selTagPtr->affectsDisplayGeometry = 0; if ((textPtr->selTagPtr->elideString != NULL) @@ -2277,12 +2285,18 @@ ConfigureText( textPtr->selTagPtr->affectsDisplayGeometry = 1; } if ((textPtr->selTagPtr->border != NULL) + || (textPtr->selTagPtr->selBorder != NULL) || (textPtr->selTagPtr->reliefString != NULL) || (textPtr->selTagPtr->bgStipple != None) || (textPtr->selTagPtr->fgColor != NULL) + || (textPtr->selTagPtr->selFgColor != NULL) || (textPtr->selTagPtr->fgStipple != None) || (textPtr->selTagPtr->overstrikeString != NULL) - || (textPtr->selTagPtr->underlineString != NULL)) { + || (textPtr->selTagPtr->overstrikeColor != NULL) + || (textPtr->selTagPtr->underlineString != NULL) + || (textPtr->selTagPtr->underlineColor != NULL) + || (textPtr->selTagPtr->lMarginColor != NULL) + || (textPtr->selTagPtr->rMarginColor != NULL)) { textPtr->selTagPtr->affectsDisplay = 1; } TkTextRedrawTag(NULL, textPtr, NULL, NULL, textPtr->selTagPtr, 1); |