summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2019-07-06 07:27:16 +0300
committerJan-Marek Glogowski <glogow@fbihome.de>2019-11-14 12:51:51 +0100
commitbce68bef088f1adb59ff199b2fc44f676d64e749 (patch)
treec679fd1b6a8028fbf53025b25f3481df817a07c9 /vcl
parent11722e2e3d48d97841f64dffebbf65d3557ea3ac (diff)
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 and 6.3, this also reverts 6.5 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_luth@sil.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4109dfff009f017e8994ea0a57119e79291ca2c8) Change-Id: Ic62fd7bb50e67647703cba3796f6d11ffb797eb5 Reviewed-on: https://gerrit.libreoffice.org/82523 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/button.cxx7
1 files changed, 6 insertions, 1 deletions
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 );