From 52a2a6c390b4491eed0a2d29424792fd802cf280 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 31 Oct 2019 10:57:31 +0000 Subject: setting has-default true on an element in a GtkPopover is fatal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in gtk 3.24.12 at least. in ColorWindow explicitly track which button is the 'default' one for the two modes instead of using get/use-default and then just grab_focus instead of setting has-default for these popover cases Change-Id: Ia226f847f666d2356c6ea4e8c47f5db8e2535410 Reviewed-on: https://gerrit.libreoffice.org/81834 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svtools/source/control/ctrlbox.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svtools') diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index d67c69dce9e3..61d1d9e729ac 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1597,12 +1597,12 @@ void SvtLineListBox::SelectEntry(SvxBorderLineStyle nStyle) if (nStyle == SvxBorderLineStyle::NONE) { m_xLineSet->SetNoSelection(); - m_xNoneButton->set_has_default(true); + m_xNoneButton->grab_focus(); } else { m_xLineSet->SelectItem(static_cast(nStyle) + 1); - m_xNoneButton->set_has_default(false); + m_xLineSet->GrabFocus(); } UpdatePreview(); } -- cgit