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 /sc/source/ui/dbgui | |
| 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 'sc/source/ui/dbgui')
| -rw-r--r-- | sc/source/ui/dbgui/csvtablebox.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 9f1de427291a..908a6ea61bad 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -25,11 +25,10 @@ ScCsvTableBox::ScCsvTableBox(weld::Builder& rBuilder) : mxRuler(new ScCsvRuler(maData, this)) , mxGrid(new ScCsvGrid(maData, rBuilder.weld_menu("popup"), this)) - , mxScroll(rBuilder.weld_scrolled_window("scrolledwindow")) + , mxScroll(rBuilder.weld_scrolled_window("scrolledwindow", true)) , mxRulerWeld(new weld::CustomWeld(rBuilder, "csvruler", *mxRuler)) , mxGridWeld(new weld::CustomWeld(rBuilder, "csvgrid", *mxGrid)) { - mxScroll->set_user_managed_scrolling(); Size aSize(mxScroll->get_approximate_digit_width() * 67, mxScroll->get_text_height() * 10); // this needs to be larger than the ScCsvGrid initial size to get it diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index ff4653f8d971..0d439f86c273 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -82,7 +82,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pPa , m_xEdVal4(m_xBuilder->weld_combo_box("val4")) , m_xBtnRemove4(m_xBuilder->weld_button("remove4")) , m_xContents(m_xBuilder->weld_widget("grid")) - , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar")) + , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar", true)) , m_xExpander(m_xBuilder->weld_expander("more")) , m_xBtnClear(m_xBuilder->weld_button("clear")) , m_xBtnOk(m_xBuilder->weld_button("ok")) @@ -259,7 +259,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) UpdateValueList(i+1); } - m_xScrollBar->set_user_managed_scrolling(); m_xScrollBar->connect_vadjustment_changed( LINK( this, ScFilterDlg, ScrollHdl ) ); m_xScrollBar->vadjustment_configure(0, 0, 8, 1, 3, 4); Size aSize(m_xContents->get_preferred_size()); |