diff options
author | Justin Luth <justin_luth@sil.org> | 2019-06-06 13:03:19 +0300 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-10 09:56:48 +0200 |
commit | 505f0c6c5a650c403f1a6d6090cebc579affb5b7 (patch) | |
tree | 0cb39b35afd1a03c8ee0bc1157412d3b4197eb95 | |
parent | d3655c22aa393dd70459f42bee547c39306e4bf0 (diff) |
Revert "tdf#108687 vcl: always enable tabstop on radio buttons"
This reverts LO 6.2 commit f2cd1c3c7cce2699d1341f726fc90cf30b52612c
because it caused regression tdf#125609. There are places
where radio-groups are not properly defined, and things are
a big mess. So reverting to previous behaviour for 6.2 stable.
This can be a fairly serious regression, because the value
of the radio buttons can change just by tabbing around.
Leaving the commit in place for master/6.3, so that a proper
solution to all problems can be developed and tested.
Change-Id: I3c71e47934c9d979d1cb22e56535f7ea3b33130c
Reviewed-on: https://gerrit.libreoffice.org/73618
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>
-rw-r--r-- | include/vcl/button.hxx | 2 | ||||
-rw-r--r-- | vcl/source/control/button.cxx | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 5bad4b5e2e15..8f7afce4aecb 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -288,7 +288,7 @@ private: bool mbStateChanged; Link<RadioButton&,void> maToggleHdl; SAL_DLLPRIVATE void ImplInitRadioButtonData(); - static SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 891dc7001ad4..cd59ce4ba5d5 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1859,7 +1859,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; + } return nStyle; } |