Tk Source Code

Check-in [bae24649]
Login

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

Overview
Comment:Remove extraneous CGContextSaveGState with no matching CGContextRestoreGState.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | bug-0d63621b6c
Files: files | file ages | folders
SHA3-256: bae2464975797b994bc1a31b3bc809a693ea8d63c61f2fef934521721aae5cea
User & Date: culler 2019-03-30 19:40:20
References
2019-03-30
21:14 Ticket [17cd1aea] mac os : combobox is displaying data upside-down status still Open with 3 other changes artifact: 8435bc90 user: fvogel
Context
2019-04-01
15:03
Use geometry masters, not parents, to find the nesting depth. check-in: 5442d6af user: culler tags: bug-0d63621b6c
2019-03-30
19:40
Remove extraneous CGContextSaveGState with no matching CGContextRestoreGState. check-in: bae24649 user: culler tags: bug-0d63621b6c
18:46
Added missing map for the Treeview background in selected state. check-in: 1074d43f user: culler tags: bug-0d63621b6c
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/ttkMacOSXTheme.c.

461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
     * If this is a popup, draw the arrow button.
     */

    if (kind == kThemePopupButton | kind == kThemeComboBox) {
	CGRect arrowBounds = bounds;
	arrowBounds.size.width = 16;
	arrowBounds.origin.x += bounds.size.width - 16;
	CGContextSaveGState(context);

	/*
	 * If the toplevel is front, paint the button blue.
	 */

	if (!(state & TTK_STATE_BACKGROUND)) {
	    GradientFillRoundedRectangle(context, arrowBounds, 4,







<







461
462
463
464
465
466
467

468
469
470
471
472
473
474
     * If this is a popup, draw the arrow button.
     */

    if (kind == kThemePopupButton | kind == kThemeComboBox) {
	CGRect arrowBounds = bounds;
	arrowBounds.size.width = 16;
	arrowBounds.origin.x += bounds.size.width - 16;


	/*
	 * If the toplevel is front, paint the button blue.
	 */

	if (!(state & TTK_STATE_BACKGROUND)) {
	    GradientFillRoundedRectangle(context, arrowBounds, 4,
952
953
954
955
956
957
958
959
960
961
962
963
964

965
966
967
968
969
970
971
    paddingPtr->top = paddingPtr->bottom = verticalPad / 2;
}

static void ButtonElementDraw(
    void *clientData, void *elementRecord, Tk_Window tkwin,
    Drawable d, Ttk_Box b, Ttk_State state)
{
    BEGIN_DRAWING(d)
    ThemeButtonParams *params = clientData;
    CGRect bounds = BoxToRect(d, b);
    HIThemeButtonDrawInfo info = computeButtonDrawInfo(params, state, tkwin);
    bounds = NormalizeButtonBounds(params->heightMetric, bounds);


    if (TkMacOSXInDarkMode(tkwin)) {
#if MAC_OS_X_VERSION_MIN_REQUIRED > 101300
	switch (info.kind) {
	case kThemePushButton:
	case kThemePopupButton:
	    DrawDarkButton(bounds, info.kind, state, dc.context);
	    break;







<




|
>







951
952
953
954
955
956
957

958
959
960
961
962
963
964
965
966
967
968
969
970
    paddingPtr->top = paddingPtr->bottom = verticalPad / 2;
}

static void ButtonElementDraw(
    void *clientData, void *elementRecord, Tk_Window tkwin,
    Drawable d, Ttk_Box b, Ttk_State state)
{

    ThemeButtonParams *params = clientData;
    CGRect bounds = BoxToRect(d, b);
    HIThemeButtonDrawInfo info = computeButtonDrawInfo(params, state, tkwin);
    bounds = NormalizeButtonBounds(params->heightMetric, bounds);
    
    BEGIN_DRAWING(d)
    if (TkMacOSXInDarkMode(tkwin)) {
#if MAC_OS_X_VERSION_MIN_REQUIRED > 101300
	switch (info.kind) {
	case kThemePushButton:
	case kThemePopupButton:
	    DrawDarkButton(bounds, info.kind, state, dc.context);
	    break;