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/miscdlgs | |
| 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/miscdlgs')
| -rw-r--r-- | sc/source/ui/miscdlgs/datafdlg.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/optsolver.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index df21fb4c26b7..0e6fe0d76584 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -35,12 +35,10 @@ ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell* pTabViewShel , m_xBtnPrev(m_xBuilder->weld_button("prev")) , m_xBtnNext(m_xBuilder->weld_button("next")) , m_xBtnClose(m_xBuilder->weld_button("close")) - , m_xSlider(m_xBuilder->weld_scrolled_window("scrollbar")) + , m_xSlider(m_xBuilder->weld_scrolled_window("scrollbar", true)) , m_xGrid(m_xBuilder->weld_container("grid")) , m_xFixedText(m_xBuilder->weld_label("label")) { - m_xSlider->set_user_managed_scrolling(); - sNewRecord = m_xFixedText->get_label(); //read header from current document, and add new controls diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 763ca762bee6..2da4898cfa48 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -198,7 +198,7 @@ ScOptSolverDlg::ScOptSolverDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Windo , m_xEdRight4(new ScCursorRefEdit(m_xBuilder->weld_entry("val4edit"))) , m_xRBRight4(new formula::RefButton(m_xBuilder->weld_button("val4button"))) , m_xBtnDel4(m_xBuilder->weld_button("del4")) - , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar")) + , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar", true)) , m_xBtnOpt(m_xBuilder->weld_button("options")) , m_xBtnCancel(m_xBuilder->weld_button("close")) , m_xBtnSolve(m_xBuilder->weld_button("ok")) @@ -323,7 +323,6 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) } m_xEdTargetValue->SetModifyHdl( LINK( this, ScOptSolverDlg, TargetModifyHdl ) ); - m_xScrollBar->set_user_managed_scrolling(); Size aSize(m_xContents->get_preferred_size()); m_xContents->set_size_request(aSize.Width(), aSize.Height()); m_xScrollBar->connect_vadjustment_changed( LINK( this, ScOptSolverDlg, ScrollHdl ) ); diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index aa19882544c6..0d873c901043 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -33,7 +33,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(weld::Window* pParent, const OUString& rTitle, : GenericDialogController(pParent, "modules/scalc/ui/tabcolordialog.ui", "TabColorDialog") , m_aTabBgColor(rDefaultColor) , m_xSelectPalette(m_xBuilder->weld_combo_box("paletteselector")) - , m_xTabBgColorSet(new ScTabBgColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin"))) + , m_xTabBgColorSet(new ScTabBgColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin", true))) , m_xTabBgColorSetWin(new weld::CustomWeld(*m_xBuilder, "colorset", *m_xTabBgColorSet)) , m_xBtnOk(m_xBuilder->weld_button("ok")) { |