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 | |
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')
-rw-r--r-- | cui/source/customize/cfg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optchart.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/labdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tpgradnt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tphatch.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tppattern.cxx | 2 |
11 files changed, 13 insertions, 15 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index dd3c5645e7e7..d638fa7ce473 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2634,7 +2634,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(weld::Window *pWindow, : GenericDialogController(pWindow, "cui/ui/iconselectordialog.ui", "IconSelector") , m_xImageManager(rXImageManager) , m_xParentImageManager(rXParentImageManager) - , m_xTbSymbol(new ValueSet(m_xBuilder->weld_scrolled_window("symbolswin"))) + , m_xTbSymbol(new ValueSet(m_xBuilder->weld_scrolled_window("symbolswin", true))) , m_xTbSymbolWin(new weld::CustomWeld(*m_xBuilder, "symbolsToolbar", *m_xTbSymbol)) , m_xFtNote(m_xBuilder->weld_label("noteLabel")) , m_xBtnImport(m_xBuilder->weld_button("importButton")) 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()); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 1df577ee13cd..7d740cfd2000 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -95,7 +95,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(weld::Container* pPage, weld::Dia , m_xPBDefault(m_xBuilder->weld_button("default")) , m_xPBAdd(m_xBuilder->weld_button("add")) , m_xPBRemove(m_xBuilder->weld_button("delete")) - , m_xValSetColorBox(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("tablewin"))) + , m_xValSetColorBox(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("tablewin", true))) , m_xValSetColorBoxWin(new weld::CustomWeld(*m_xBuilder, "table", *m_xValSetColorBox)) { m_xLbChartColors->set_size_request(-1, m_xLbChartColors->get_height_rows(16)); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 39098871bd0b..0ae754eeb2e7 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -88,7 +88,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(weld::Container* pPage, weld::DialogControl , m_xFT_LENGTHFT(m_xBuilder->weld_label("lengthft")) , m_xMF_LENGTH(m_xBuilder->weld_metric_spin_button("length", FieldUnit::MM)) , m_xCB_OPTIMAL(m_xBuilder->weld_check_button("optimal")) - , m_xCT_CAPTTYPE(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) + , m_xCT_CAPTTYPE(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin", true))) , m_xCT_CAPTTYPEWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xCT_CAPTTYPE)) { Size aSize(m_xCT_CAPTTYPE->GetDrawingArea()->get_ref_device().LogicToPixel(Size(187, 38), MapMode(MapUnit::MapAppFont))); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 4eb04ec24b40..4e9b322f4f87 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -733,7 +733,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogC , bPreset(false) , m_xErrorText(m_xBuilder->weld_label("errorft")) , m_xBtBrowseFile(m_xBuilder->weld_button("browseBtn")) - , m_xExamplesVS(new SvxBmpNumValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) + , m_xExamplesVS(new SvxBmpNumValueSet(m_xBuilder->weld_scrolled_window("valuesetwin", true))) , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xExamplesVS)) { SetExchangeSupport(); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 9797c73b1da0..cff0dab685b0 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -76,7 +76,7 @@ SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, weld::DialogControlle , m_aXFillAttr(rInAttrs.GetPool()) , m_rXFSet(m_aXFillAttr.GetItemSet()) , mpView(nullptr) - , m_xBitmapLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("bitmapwin"))) + , m_xBitmapLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("bitmapwin", true))) , m_xBitmapStyleLB(m_xBuilder->weld_combo_box("bitmapstyle")) , m_xSizeBox(m_xBuilder->weld_container("sizebox")) , m_xTsbScale(m_xBuilder->weld_check_button("scaletsb")) diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 8a79dcd44c9e..586557c2c089 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -46,7 +46,7 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController* , rXFSet( aXFillAttr.GetItemSet() ) , eCM( ColorModel::RGB ) , m_context(comphelper::getProcessComponentContext()) - , m_xValSetColorList(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin"))) + , m_xValSetColorList(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin", true))) , m_xValSetRecentList(new SvxColorValueSet(nullptr)) , m_xSelectPalette(m_xBuilder->weld_combo_box("paletteselector")) , m_xRbRGB(m_xBuilder->weld_radio_button("RGB")) diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index dc54b084d085..6540dfde1a5e 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -60,7 +60,7 @@ SvxGradientTabPage::SvxGradientTabPage(weld::Container* pPage, weld::DialogContr , m_xMtrColorFrom(m_xBuilder->weld_metric_spin_button("colorfrommtr", FieldUnit::PERCENT)) , m_xLbColorTo(new ColorListBox(m_xBuilder->weld_menu_button("colortolb"), pController->getDialog())) , m_xMtrColorTo(m_xBuilder->weld_metric_spin_button("colortomtr", FieldUnit::PERCENT)) - , m_xGradientLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("gradientpresetlistwin"))) + , m_xGradientLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("gradientpresetlistwin", true))) , m_xMtrIncrement(m_xBuilder->weld_spin_button("incrementmtr")) , m_xCbIncrement(m_xBuilder->weld_check_button("autoincrement")) , m_xBtnAdd(m_xBuilder->weld_button("add")) diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index d1dbbc79aa30..b0a6753db997 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -57,7 +57,7 @@ SvxHatchTabPage::SvxHatchTabPage(weld::Container* pPage, weld::DialogController* , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pController->getDialog())) , m_xCbBackgroundColor(m_xBuilder->weld_check_button("backgroundcolor")) , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("backgroundcolorlb"), pController->getDialog())) - , m_xHatchLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("hatchpresetlistwin"))) + , m_xHatchLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("hatchpresetlistwin", true))) , m_xBtnAdd(m_xBuilder->weld_button("add")) , m_xBtnModify(m_xBuilder->weld_button("modify")) , m_xHatchLBWin(new weld::CustomWeld(*m_xBuilder, "hatchpresetlist", *m_xHatchLB)) diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index a22197d773f8..553430b5b38a 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -79,7 +79,7 @@ SvxPatternTabPage::SvxPatternTabPage(weld::Container* pPage, weld::DialogControl , m_xCtlPixel(new SvxPixelCtl(this)) , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pController->getDialog())) , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_BACKGROUND_COLOR"), pController->getDialog())) - , m_xPatternLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("patternpresetlistwin"))) + , m_xPatternLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("patternpresetlistwin", true))) , m_xBtnAdd(m_xBuilder->weld_button("BTN_ADD")) , m_xBtnModify(m_xBuilder->weld_button("BTN_MODIFY")) , m_xCtlPixelWin(new weld::CustomWeld(*m_xBuilder, "CTL_PIXEL", *m_xCtlPixel)) |