Kaydet (Commit) 35701e73 authored tarafından Caolán McNamara's avatar Caolán McNamara

wrong "to-page" reported in split notebooks

and when switching decks we need that notification to occur too

Change-Id: Ica3c83ad34e072faf044c6d4667f34756688de09
Reviewed-on: https://gerrit.libreoffice.org/68171
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 7bc3ac14
......@@ -3183,6 +3183,13 @@ private:
void signal_switch_page(int nNewPage)
{
if (m_bOverFlowBoxIsStart)
{
auto nOverFlowLen = m_bOverFlowBoxActive ? gtk_notebook_get_n_pages(m_pOverFlowNotebook) - 1 : 0;
// add count of overflow pages, minus the extra tab
nNewPage += nOverFlowLen;
}
bool bAllow = !m_aLeavePageHdl.IsSet() || m_aLeavePageHdl.Call(get_current_page_ident());
if (!bAllow)
{
......@@ -3246,9 +3253,11 @@ private:
std::swap(m_nStartTabCount, m_nEndTabCount);
split_notebooks();
gtk_notebook_set_current_page(m_pNotebook, nNewPage);
enable_notify_events();
// we want to call this outside enable_notify_events so that the main
// notebook switch-page callback is triggered
gtk_notebook_set_current_page(m_pNotebook, nNewPage);
}
static OString get_page_ident(GtkNotebook *pNotebook, guint nPage)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment