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 /svx | |
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 'svx')
-rw-r--r-- | svx/source/dialog/charmap.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/rubydialog.cxx | 3 | ||||
-rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 |
7 files changed, 7 insertions, 10 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 5ad20c80ba00..96ac6ad27c5a 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -72,8 +72,6 @@ SvxShowCharSet::SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWi , mbUpdateBackground(true) { init(); - - mxScrollArea->set_user_managed_scrolling(); } void SvxShowCharSet::SetDrawingArea(weld::DrawingArea* pDrawingArea) diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 357f0d9e3134..f4161b37fe9c 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -213,7 +213,7 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, weld::Wind , m_xRight3ED(m_xBuilder->weld_entry("Right3ED")) , m_xLeft4ED(m_xBuilder->weld_entry("Left4ED")) , m_xRight4ED(m_xBuilder->weld_entry("Right4ED")) - , m_xScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow")) + , m_xScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow", true)) , m_xAdjustLB(m_xBuilder->weld_combo_box("adjustlb")) , m_xPositionLB(m_xBuilder->weld_combo_box("positionlb")) , m_xCharStyleFT(m_xBuilder->weld_label("styleft")) @@ -228,7 +228,6 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, weld::Wind { m_xCharStyleLB->make_sorted(); m_xPreviewWin->setRubyDialog(this); - m_xScrolledWindow->set_user_managed_scrolling(); m_xScrolledWindow->set_size_request(-1, m_xGrid->get_preferred_size().Height()); m_xScrolledWindow->set_vpolicy(VclPolicyType::NEVER); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index e17e275600f5..71dd0ab32784 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -333,7 +333,7 @@ void GalleryThemePopup::BackgroundMenuSelectHdl(sal_uInt16 nPos) GalleryBrowser2::GalleryBrowser2(weld::Builder& rBuilder, Gallery* pGallery) : mpGallery(pGallery) , mpCurTheme(nullptr) - , mxIconView(new GalleryIconView(this, rBuilder.weld_scrolled_window("galleryscroll"))) + , mxIconView(new GalleryIconView(this, rBuilder.weld_scrolled_window("galleryscroll", true))) , mxIconViewWin(new weld::CustomWeld(rBuilder, "gallery", *mxIconView)) , mxListView(rBuilder.weld_tree_view("gallerylist")) , mxPreview(new GalleryPreview(this, rBuilder.weld_scrolled_window("previewscroll"))) diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index e06426a0c686..069c1c871e8b 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -183,7 +183,7 @@ SvxColorDockingWindow::SvxColorDockingWindow(SfxBindings* _pBindings, SfxChildWi : SfxDockingWindow(_pBindings, pCW, _pParent, "DockingColorWindow", "svx/ui/dockingcolorwindow.ui") , pColorList() - , xColorSet(new SvxColorValueSet_docking(m_xBuilder->weld_scrolled_window("valuesetwin"))) + , xColorSet(new SvxColorValueSet_docking(m_xBuilder->weld_scrolled_window("valuesetwin", true))) , xColorSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *xColorSet)) { SetText(SvxResId(STR_COLORTABLE)); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 24fa16afbe39..75f78f71d35f 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -57,7 +57,7 @@ FontWorkGalleryDialog::FontWorkGalleryDialog(weld::Window* pParent, SdrView& rSd , mrSdrView(rSdrView) , mppSdrObject(nullptr) , mpDestModel(nullptr) - , maCtlFavorites(m_xBuilder->weld_scrolled_window("ctlFavoriteswin")) + , maCtlFavorites(m_xBuilder->weld_scrolled_window("ctlFavoriteswin", true)) , mxCtlFavorites(new weld::CustomWeld(*m_xBuilder, "ctlFavorites", maCtlFavorites)) , mxOKButton(m_xBuilder->weld_button("ok")) { diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index e612ee2f4298..1bd1ff0221fd 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -266,7 +266,7 @@ constexpr sal_uInt16 gnCols = 2; SvxLineEndWindow::SvxLineEndWindow(SvxLineEndToolBoxControl* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/floatinglineend.ui", "FloatingLineEnd") , mxControl(pControl) - , mxLineEndSet(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) + , mxLineEndSet(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin", true))) , mxLineEndSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxLineEndSet)) , mnLines(12) { @@ -504,7 +504,7 @@ com_sun_star_comp_svx_LineEndToolBoxControl_get_implementation( SvxLineBox::SvxLineBox(SvxLineStyleToolBoxControl* pControl, weld::Widget* pParent, int nInitialIndex) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/floatinglinestyle.ui", "FloatingLineStyle") , mxControl(pControl) - , mxLineStyleSet(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) + , mxLineStyleSet(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin", true))) , mxLineStyleSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxLineStyleSet)) { mxLineStyleSet->SetStyle(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 6d46b52ac94d..464aa72e46b0 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1765,7 +1765,7 @@ ColorWindow::ColorWindow(const OUString& rCommand, , mxPaletteManager(rPaletteManager) , mrColorStatus(rColorStatus) , maColorSelectFunction(aFunction) - , mxColorSet(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin"))) + , mxColorSet(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin", true))) , mxRecentColorSet(new SvxColorValueSet(nullptr)) , mxPaletteListBox(m_xBuilder->weld_combo_box("palette_listbox")) , mxButtonAutoColor(m_xBuilder->weld_button("auto_color_button")) |