diff options
| author | jenglish@flightlab.com <jenglish> | 2007-11-08 01:40:24 (GMT) |
|---|---|---|
| committer | jenglish@flightlab.com <jenglish> | 2007-11-08 01:40:24 (GMT) |
| commit | 132c425dc6f17343a9f048737bc53d72b559bf7e (patch) | |
| tree | add48b19aba5fd375a93fc51364bb2e52cfb953d /win/ttkWinXPTheme.c | |
| parent | b1e6bb188a59d356a001a220869fa6002507fd2f (diff) | |
| download | tk-132c425dc6f17343a9f048737bc53d72b559bf7e.zip tk-132c425dc6f17343a9f048737bc53d72b559bf7e.tar.gz tk-132c425dc6f17343a9f048737bc53d72b559bf7e.tar.bz2 | |
Ttk_ElementSize: Fixed longstanding, subtle bug that caused element padding
to sometimes be counted twice in size computations.
Fix ElementSizeProcs affected by previous change.
Diffstat (limited to 'win/ttkWinXPTheme.c')
| -rw-r--r-- | win/ttkWinXPTheme.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index e18d604..9f42cf6 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -1,5 +1,5 @@ /* - * $Id: ttkWinXPTheme.c,v 1.13 2007/10/25 07:08:27 jenglish Exp $ + * $Id: ttkWinXPTheme.c,v 1.14 2007/11/08 01:40:26 jenglish Exp $ * * Tk theme engine which uses the Windows XP "Visual Styles" API * Adapted from Georgios Petasis' XP theme patch. @@ -493,6 +493,10 @@ static void GenericElementSize( /* See NOTE-GetThemeMargins */ *paddingPtr = elementData->info->padding; + if (elementData->info->flags & PAD_MARGINS) { + *widthPtr += Ttk_PaddingWidth(elementData->info->padding); + *heightPtr += Ttk_PaddingHeight(elementData->info->padding); + } } static void GenericElementDraw( |