Tk Source Code

Check-in [bcf27919]
Login

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

Overview
Comment:Fixed TTK_STATE_USER2 similarly as TTK_STATE_USER1. These bits are set for the leftmost and rightmost *visible* (i.e. non hidden) tabs
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | bug-2912962fff
Files: files | file ages | folders
SHA1: bcf2791937e877d7d0675b07efbc10da3e2ee9c3
User & Date: fvogel 2017-04-03 14:44:48.411
Context
2017-04-07
20:06
Fix [2912962fff]: Notebook does not set TTK_STATE_USER1 and TTK_STATE_USER2. check-in: d807afde user: fvogel tags: core-8-6-branch
2017-04-03
14:44
Fixed TTK_STATE_USER2 similarly as TTK_STATE_USER1. These bits are set for the leftmost and rightmost *visible* (i.e. non hidden) tabs Closed-Leaf check-in: bcf27919 user: fvogel tags: bug-2912962fff
06:29
Fix [2912962fff]: Notebook does not set TTK_STATE_USER1. Patch from Jos Decoster. check-in: 2c14ebc8 user: fvogel tags: bug-2912962fff
Changes
Unified Diff Ignore Whitespace Patch
Changes to generic/ttk/ttkNotebook.c.
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
    }
}

/*
 * TabState --
 * 	Return the state of the specified tab, based on
 * 	notebook state, currentIndex, activeIndex, and user-specified tab state.
 *	The USER1 bit is set for the leftmost tab, and USER2
 * 	is set for the rightmost tab.
 */
static Ttk_State TabState(Notebook *nb, int index)
{
    Ttk_State state = nb->core.state;
    Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
    int i = 0;








|
|







284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
    }
}

/*
 * TabState --
 * 	Return the state of the specified tab, based on
 * 	notebook state, currentIndex, activeIndex, and user-specified tab state.
 *	The USER1 bit is set for the leftmost visible tab, and USER2
 * 	is set for the rightmost visible tab.
 */
static Ttk_State TabState(Notebook *nb, int index)
{
    Ttk_State state = nb->core.state;
    Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
    int i = 0;

312
313
314
315
316
317
318
319





320


321
322
323
324
325
326
327
	    continue;
	}
	if (index == i) {
	    state |= TTK_STATE_USER1;
	}
	break;
    }
    if (index == Ttk_NumberSlaves(nb->notebook.mgr) - 1) {





    	state |= TTK_STATE_USER2;


    }
    if (tab->state == TAB_STATE_DISABLED) {
	state |= TTK_STATE_DISABLED;
    }

    return state;
}







|
>
>
>
>
>
|
>
>







312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
	    continue;
	}
	if (index == i) {
	    state |= TTK_STATE_USER1;
	}
	break;
    }
    for (i = Ttk_NumberSlaves(nb->notebook.mgr) - 1; i >= 0; --i) {
	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
	if (tab->state == TAB_STATE_HIDDEN) {
	    continue;
	}
	if (index == i) {
	    state |= TTK_STATE_USER2;
	}
	break;
    }
    if (tab->state == TAB_STATE_DISABLED) {
	state |= TTK_STATE_DISABLED;
    }

    return state;
}