Tk Source Code

Check-in [c4051e7a]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix for 5824a992df, images not displaying in Cocoa in label with sunken relief
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA1: c4051e7ad3cce3938c434ed9a8d4b1dbae599738
User & Date: kevin_walzer 2015-02-28 02:59:49
Context
2015-03-05
15:57
Fix for keyboard modifier events, thanks to Trevor Williams for patch check-in: 1099ec55 user: kevin_walzer tags: core-8-5-branch
2015-03-02
22:35
merge 8.5 check-in: c21f2b51 user: dgp tags: core-8-5-18-rc
2015-02-28
03:17
merge mark check-in: 2a868d77 user: kevin_walzer tags: trunk
02:59
Fix for 5824a992df, images not displaying in Cocoa in label with sunken relief check-in: c4051e7a user: kevin_walzer tags: core-8-5-branch
2015-02-22
18:03
Fix for CGRect/NSRect confusion check-in: 004b3b28 user: kevin_walzer tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXButton.c.

606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
	int y;
	TkComputeAnchor(butPtr->anchor, tkwin,
			butPtr->padX + butPtr->borderWidth,
			butPtr->padY + butPtr->borderWidth,
			width + butPtr->indicatorSpace,
			height, &x, &y);
        x += butPtr->indicatorSpace;
	if (dpPtr->relief == TK_RELIEF_SUNKEN) {
	  x += dpPtr->offset;
	  y += dpPtr->offset;
	} else if (dpPtr->relief == TK_RELIEF_RAISED) {
	  x -= dpPtr->offset;
	  y -= dpPtr->offset;
	}
	if (pressed) {
	  x += dpPtr->offset;
	  y += dpPtr->offset;
	}
	imageXOffset += x;
	imageYOffset += y;







<
<
<
<
<
<
<







606
607
608
609
610
611
612







613
614
615
616
617
618
619
	int y;
	TkComputeAnchor(butPtr->anchor, tkwin,
			butPtr->padX + butPtr->borderWidth,
			butPtr->padY + butPtr->borderWidth,
			width + butPtr->indicatorSpace,
			height, &x, &y);
        x += butPtr->indicatorSpace;







	if (pressed) {
	  x += dpPtr->offset;
	  y += dpPtr->offset;
	}
	imageXOffset += x;
	imageYOffset += y;