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 /cui/source/dialogs | |
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 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 28260d70cf4c..25b05c68d2b1 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -132,9 +132,9 @@ SvxCharacterMap::SvxCharacterMap(weld::Widget* pParent, const SfxItemSet* pSet, std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar14", m_aFavCharView[13]), std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar15", m_aFavCharView[14]), std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar16", m_aFavCharView[15])} - , m_xShowSet(new SvxShowCharSet(m_xBuilder->weld_scrolled_window("showscroll"), m_xVirDev)) + , m_xShowSet(new SvxShowCharSet(m_xBuilder->weld_scrolled_window("showscroll", true), m_xVirDev)) , m_xShowSetArea(new weld::CustomWeld(*m_xBuilder, "showcharset", *m_xShowSet)) - , m_xSearchSet(new SvxSearchCharSet(m_xBuilder->weld_scrolled_window("searchscroll"), m_xVirDev)) + , m_xSearchSet(new SvxSearchCharSet(m_xBuilder->weld_scrolled_window("searchscroll", true), m_xVirDev)) , m_xSearchSetArea(new weld::CustomWeld(*m_xBuilder, "searchcharset", *m_xSearchSet)) { m_aShowChar.SetCentered(true); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 25fadc445c5b..8bf1e1ccdd12 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -284,7 +284,7 @@ namespace svx SuggestionDisplay::SuggestionDisplay(weld::Builder& rBuilder) : m_bDisplayListBox( true ) , m_bInSelectionUpdate( false ) - , m_xValueSet(new SuggestionSet(rBuilder.weld_scrolled_window("scrollwin"))) + , m_xValueSet(new SuggestionSet(rBuilder.weld_scrolled_window("scrollwin", true))) , m_xValueSetWin(new weld::CustomWeld(rBuilder, "valueset", *m_xValueSet)) , m_xListBox(rBuilder.weld_tree_view("listbox")) { @@ -1435,12 +1435,10 @@ namespace svx , m_xEdit3(new SuggestionEdit(m_xBuilder->weld_entry("edit3"), this)) , m_xEdit4(new SuggestionEdit(m_xBuilder->weld_entry("edit4"), this)) , m_xContents(m_xBuilder->weld_widget("box")) - , m_xScrollSB(m_xBuilder->weld_scrolled_window("scrollbar")) + , m_xScrollSB(m_xBuilder->weld_scrolled_window("scrollbar", true)) , m_xNewPB(m_xBuilder->weld_button("new")) , m_xDeletePB(m_xBuilder->weld_button("delete")) { - m_xScrollSB->set_user_managed_scrolling(); - Size aSize(m_xContents->get_preferred_size()); m_xScrollSB->set_size_request(-1, aSize.Height()); |