diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-06 11:23:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-06 16:47:04 +0200 |
| commit | f1f33b332a0b4ada8ac8ff885fc2efee768091a6 (patch) | |
| tree | ba0c323cf00f66290a3a7cd3a18b8af2a4780ee8 /desktop | |
| parent | d15aa807be1c595dad9abc1dea04bb922570015a (diff) | |
move set_user_managed_scrolling to an initial weld argument
gtk is creating a11y objects on widgets changing parents so manage when that
can happen to avoid premature creation of custom widget a11y objects
Change-Id: I4879a93a897b2e4084cf6af0c9c0b0f0c1062254
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104025
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 91fe52ebed50..de01830fb9fe 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -433,7 +433,7 @@ ExtMgrDialog::ExtMgrDialog(weld::Window *pParent, TheExtensionManager *pManager) , m_bClosed(false) , m_nProgress(0) , m_pManager(pManager) - , m_xExtensionBox(new ExtBoxWithBtns_Impl(m_xBuilder->weld_scrolled_window("scroll"))) + , m_xExtensionBox(new ExtBoxWithBtns_Impl(m_xBuilder->weld_scrolled_window("scroll", true))) , m_xExtensionBoxWnd(new weld::CustomWeld(*m_xBuilder, "extensions", *m_xExtensionBox)) , m_xOptionsBtn(m_xBuilder->weld_button("optionsbtn")) , m_xAddBtn(m_xBuilder->weld_button("addbtn")) @@ -982,7 +982,7 @@ UpdateRequiredDialog::UpdateRequiredDialog(weld::Window *pParent, TheExtensionMa , m_bHasLockedEntries(false) , m_nProgress(0) , m_pManager(pManager) - , m_xExtensionBox(new ExtensionBox_Impl(m_xBuilder->weld_scrolled_window("scroll"))) + , m_xExtensionBox(new ExtensionBox_Impl(m_xBuilder->weld_scrolled_window("scroll", true))) , m_xExtensionBoxWnd(new weld::CustomWeld(*m_xBuilder, "extensions", *m_xExtensionBox)) , m_xUpdateNeeded(m_xBuilder->weld_label("updatelabel")) , m_xUpdateBtn(m_xBuilder->weld_button("ok")) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index ccf546d713b7..3000a29a91c0 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -198,7 +198,6 @@ ExtensionBox_Impl::ExtensionBox_Impl(std::unique_ptr<weld::ScrolledWindow> xScro void ExtensionBox_Impl::Init() { - m_xScrollBar->set_user_managed_scrolling(); m_xScrollBar->connect_vadjustment_changed( LINK( this, ExtensionBox_Impl, ScrollHdl ) ); auto nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE; |