summaryrefslogtreecommitdiffstats
path: root/win/tkWinButton.c
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2009-10-05 14:49:20 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2009-10-05 14:49:20 (GMT)
commitabba76b707739e5a8614f12f8d35ffda60329b1e (patch)
treebcd8d3dded70a02fcadde5e9bdd7364c57316641 /win/tkWinButton.c
parent22d313609c13a93c26cb1347aa931d255b07d868 (diff)
downloadtk-abba76b707739e5a8614f12f8d35ffda60329b1e.zip
tk-abba76b707739e5a8614f12f8d35ffda60329b1e.tar.gz
tk-abba76b707739e5a8614f12f8d35ffda60329b1e.tar.bz2
[Bug #2860827] avoid 3D effects with user-specified backgrounds
The default disabled text is embossed on Windows. But this looks poor when a non-default background color is in use. This patch disables the embossed effect for buttons and labels when the background is non- standard.
Diffstat (limited to 'win/tkWinButton.c')
-rw-r--r--win/tkWinButton.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index 8aafd7b..21fc3fb 100644
--- a/win/tkWinButton.c
+++ b/win/tkWinButton.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinButton.c,v 1.36 2008/12/09 21:22:56 dgp Exp $
+ * RCS: @(#) $Id: tkWinButton.c,v 1.37 2009/10/05 14:49:21 patthoyts Exp $
*/
#define OEMRESOURCE
@@ -552,15 +552,17 @@ TkpDisplayButton(
(butPtr->disabledFg != NULL)) {
COLORREF oldFgColor = gc->foreground;
- gc->foreground = GetSysColor(COLOR_3DHILIGHT);
- Tk_DrawTextLayout(butPtr->display, pixmap, gc,
+ if (gc->background == GetSysColor(COLOR_BTNFACE)) {
+ gc->foreground = GetSysColor(COLOR_3DHILIGHT);
+ Tk_DrawTextLayout(butPtr->display, pixmap, gc,
butPtr->textLayout, x + textXOffset + 1,
y + textYOffset + 1, 0, -1);
- Tk_UnderlineTextLayout(butPtr->display, pixmap, gc,
+ Tk_UnderlineTextLayout(butPtr->display, pixmap, gc,
butPtr->textLayout, x + textXOffset + 1,
y + textYOffset + 1,
butPtr->underline);
- gc->foreground = oldFgColor;
+ gc->foreground = oldFgColor;
+ }
}
Tk_DrawTextLayout(butPtr->display, pixmap, gc,
@@ -615,13 +617,15 @@ TkpDisplayButton(
if ((butPtr->state == STATE_DISABLED) &&
(butPtr->disabledFg != NULL)) {
COLORREF oldFgColor = gc->foreground;
- gc->foreground = GetSysColor(COLOR_3DHILIGHT);
- Tk_DrawTextLayout(butPtr->display, pixmap, gc,
+ if (gc->background == GetSysColor(COLOR_BTNFACE)) {
+ gc->foreground = GetSysColor(COLOR_3DHILIGHT);
+ Tk_DrawTextLayout(butPtr->display, pixmap, gc,
butPtr->textLayout,
x + 1, y + 1, 0, -1);
- Tk_UnderlineTextLayout(butPtr->display, pixmap, gc,
+ Tk_UnderlineTextLayout(butPtr->display, pixmap, gc,
butPtr->textLayout, x + 1, y + 1, butPtr->underline);
- gc->foreground = oldFgColor;
+ gc->foreground = oldFgColor;
+ }
}
Tk_DrawTextLayout(butPtr->display, pixmap, gc, butPtr->textLayout,
x, y, 0, -1);