summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2017-08-08 19:31:09 (GMT)
committerfvogel <fvogelnew1@free.fr>2017-08-08 19:31:09 (GMT)
commit49644f7f4298d5bd2038227bd5db4401e2f881a6 (patch)
tree8481cbc1e91aa65071a2b0304991f169e604d460 /generic
parent9f204fc74b2cd678951c1a6816e2b581e5d5b1a8 (diff)
downloadtk-49644f7f4298d5bd2038227bd5db4401e2f881a6.zip
tk-49644f7f4298d5bd2038227bd5db4401e2f881a6.tar.gz
tk-49644f7f4298d5bd2038227bd5db4401e2f881a6.tar.bz2
Fix [4966cad4d4]: Wrong tab shown in ttk::notebook. Patch from Gregor Cramer. Cherrypicked [e033e444].
Diffstat (limited to 'generic')
-rw-r--r--generic/ttk/ttkNotebook.c7
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");