Tk Source Code

Check-in [959b73b5]
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:Cleanup of bounds in button code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 959b73b533b47fa8a3b4b1b80c2f9eb6efe5e461
User & Date: kevin_walzer 2015-02-16 22:06:24
Context
2015-02-16
22:06
Merge mark check-in: f434c087 user: kevin_walzer tags: trunk
22:06
Cleanup of bounds in button code. check-in: 959b73b5 user: kevin_walzer tags: trunk
20:21
Merge mark; merging on request of fvogel to avoid conflicts in his merges check-in: c4b47505 user: kevin_walzer tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXButton.c.

406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
        if (width < contBounds.size.width) {
    	  width = contBounds.size.width;
        }

        /* Pad to fill difference between content bounds and button bounds. */
    	paddingx = contBounds.origin.x;
    	paddingy = contBounds.origin.y;
        if (paddingx > 0) {
    	  //width += paddingx;
        }
        if (paddingy > 0) {
    	  //height += paddingy;
        }

        if (height < paddingx - 4) {
            /* can't have buttons much shorter than button side diameter. */
            height = paddingx - 4;
    	}

    } else {






<
<
<
<
<
<







406
407
408
409
410
411
412






413
414
415
416
417
418
419
        if (width < contBounds.size.width) {
    	  width = contBounds.size.width;
        }

        /* Pad to fill difference between content bounds and button bounds. */
    	paddingx = contBounds.origin.x;
    	paddingy = contBounds.origin.y;







        if (height < paddingx - 4) {
            /* can't have buttons much shorter than button side diameter. */
            height = paddingx - 4;
    	}

    } else {