Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Backport fix for disabled images in ttk buttons for Tk-Cocoa |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | tk-cocoa-8-5-backport |
| Files: | files | file ages | folders |
| SHA1: |
457a6a8b6f3982c1f36eedefbcf56c22 |
| User & Date: | kevin_walzer 2012-03-10 14:47:00 |
Context
|
2012-04-23
| ||
| 09:18 | merge from main 8.5 branch check-in: 81e7e6f5 user: dkf tags: tk-cocoa-8-5-backport | |
|
2012-03-10
| ||
| 14:47 | Backport fix for disabled images in ttk buttons for Tk-Cocoa check-in: 457a6a8b user: kevin_walzer tags: tk-cocoa-8-5-backport | |
|
2012-02-22
| ||
| 23:00 | Patch for font metrics and colorspace provided by Adrian Robert check-in: e5be09bc user: kevin_walzer tags: tk-cocoa-8-5-backport | |
Changes
Changes to generic/ttk/ttkLabel.c.
| ︙ | ︙ | |||
321 322 323 324 325 326 327 328 |
Tk_RedrawImage(image->tkimg, 0,0, width, height, d, b.x, b.y);
/* If we're disabled there's no state-specific 'disabled' image,
* stipple the image.
* @@@ Possibly: Don't do disabled-stippling at all;
* @@@ it's ugly and out of fashion.
*/
| > > | > > | 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 |
Tk_RedrawImage(image->tkimg, 0,0, width, height, d, b.x, b.y);
/* If we're disabled there's no state-specific 'disabled' image,
* stipple the image.
* @@@ Possibly: Don't do disabled-stippling at all;
* @@@ it's ugly and out of fashion.
* Do not stipple at all under Aqua, just draw the image: it shows up
* as a white rectangle otherwise.
*/
if (state & TTK_STATE_DISABLED) {
if (TtkSelectImage(image->imageSpec, 0ul) == image->tkimg) {
#ifndef MAC_OSX_TK
StippleOver(image, tkwin, d, b.x,b.y);
#endif
}
}
}
static void ImageElementSize(
void *clientData, void *elementRecord, Tk_Window tkwin,
int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
|
| ︙ | ︙ | |||
663 664 665 666 667 668 669 670 |
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
Ttk_RegisterElement(interp, theme, "text", &TextElementSpec, NULL);
Ttk_RegisterElement(interp, theme, "image", &ImageElementSpec, NULL);
Ttk_RegisterElement(interp, theme, "label", &LabelElementSpec, NULL);
}
| > > | 667 668 669 670 671 672 673 674 675 676 |
{
Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
Ttk_RegisterElement(interp, theme, "text", &TextElementSpec, NULL);
Ttk_RegisterElement(interp, theme, "image", &ImageElementSpec, NULL);
Ttk_RegisterElement(interp, theme, "label", &LabelElementSpec, NULL);
}
|