diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-08-09 14:37:58 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-08-09 14:37:58 (GMT) |
| commit | d34d76dd0d9c0144e573d9e194655a56e56d32be (patch) | |
| tree | f9e1f1fd697ed0a32915302eb00a6eb7e6119f89 /generic | |
| parent | 051f04558369d4df68f9c7df05f1207ef72f609c (diff) | |
| parent | 49644f7f4298d5bd2038227bd5db4401e2f881a6 (diff) | |
| download | tk-d34d76dd0d9c0144e573d9e194655a56e56d32be.zip tk-d34d76dd0d9c0144e573d9e194655a56e56d32be.tar.gz tk-d34d76dd0d9c0144e573d9e194655a56e56d32be.tar.bz2 | |
merge 8.6; update changesreleasecore_8_6_7core_8_6_7_rc
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 83d7db9..56439a6 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -627,9 +627,12 @@ static void SelectTab(Notebook *nb, int index) Ttk_UnmapSlave(nb->notebook.mgr, currentIndex); } - NotebookPlaceSlave(nb, index); - + /* Must be set before calling NotebookPlaceSlave(), otherwise it may + * happen that NotebookPlaceSlaves(), triggered by an interveaning + * geometry request, will swap to old index. */ nb->notebook.currentIndex = index; + + NotebookPlaceSlave(nb, index); TtkRedisplayWidget(&nb->core); TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged"); |