vcl/source/control/button.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
New commits: commit 464b42af4055870322a1af65eaf590683b4776e7 Author: Justin Luth <justin_l...@sil.org> AuthorDate: Sat Jul 6 07:27:16 2019 +0300 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu Nov 14 16:08:36 2019 +0100 Revert "tdf#108687 vcl: always enable tabstop on radio buttons" This reverts LO 6.2 commit f2cd1c3c7cce2699d1341f726fc90cf30b52612c because it most recently caused regressions tdf#128749 and tdf#128625. There are places where radio-groups are not properly defined, and things are a big mess. -about 4 levels of radio buttons are created. -the last level does not do grouping properly. -the tab order is defined too early, before all the controls are fully made. -this code is repeated for EVERY control added. Already reverted in 6.2, 6.3 and 6.5, this also reverts 6.4 because after looking again I don't see any way out of this, short of rewriting all of the old code. Reviewed-on: https://gerrit.libreoffice.org/75157 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_l...@sil.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 4109dfff009f017e8994ea0a57119e79291ca2c8) Change-Id: Ic62fd7bb50e67647703cba3796f6d11ffb797eb5 Reviewed-on: https://gerrit.libreoffice.org/82523 Reviewed-by: Justin Luth <justin_l...@sil.org> Tested-by: Justin Luth <justin_l...@sil.org> (cherry picked from commit bce68bef088f1adb59ff199b2fc44f676d64e749) Reviewed-on: https://gerrit.libreoffice.org/82671 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 4c6f535669e3..6eb27669f306 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1809,7 +1809,12 @@ WinBits RadioButton::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nSty (!pPrevWindow || (pPrevWindow->GetType() != WindowType::RADIOBUTTON)) ) nStyle |= WB_GROUP; if ( !(nStyle & WB_NOTABSTOP) ) - nStyle |= WB_TABSTOP; + { + if ( IsChecked() ) + nStyle |= WB_TABSTOP; + else + nStyle &= ~WB_TABSTOP; + } if ( IsChecked() && IsRadioCheckEnabled() ) ImplUncheckAllOther( /*bSetStyle=*/false ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits