diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-04-05 15:27:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-04-05 20:24:51 +0100 |
commit | dd46727b99d4bb5135451aa7e5e1bdb197373843 (patch) | |
tree | 47ee49810362bb405339682d27d36092d101cffc /svx | |
parent | 92d43df81e282d20c129b105b2c7300a312091eb (diff) |
Resolves; tdf#87120 no keyboard navigation inside floating windows
lets try and treat these the same as we do normal toplevels
like dialogs if they popup with GrabFocus.
This way focus can be set on widgets inside the floating windows, and
so keyboard traversal of widgets etc all works.
Change-Id: If447429756cf5d136b9c2e2f62fafb37c167b1ce
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 8 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 25 |
2 files changed, 0 insertions, 33 deletions
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index e5e83d60f42a..e5141f15324c 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -73,7 +73,6 @@ public: bool IsUserSelected() const { return bUserSel; } void SetUserSelected( bool bVal ) { bUserSel = bVal; } - virtual vcl::Window* GetPreferredKeyInputWindow() override; }; SvxPopupWindowListBox::SvxPopupWindowListBox(sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx) @@ -128,13 +127,6 @@ void SvxPopupWindowListBox::StateChanged( SfxPopupWindow::StateChanged( nSID, eState, pState ); } -vcl::Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() -{ - // allows forwarding key events in the correct window - // without setting the focus - return m_pListBox->GetPreferredKeyInputWindow(); -} - SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ), pPopupWin ( nullptr ) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 66376264ba1e..dc70581cb383 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -259,7 +259,6 @@ private: protected: virtual void Resize() override; virtual bool Close() override; - virtual vcl::Window* GetPreferredKeyInputWindow() override; virtual void GetFocus() override; public: @@ -285,9 +284,7 @@ private: protected: virtual void Resize() override; virtual bool Close() override; - virtual vcl::Window* GetPreferredKeyInputWindow() override; virtual void GetFocus() override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual ~SvxLineWindow_Impl() { disposeOnce(); } @@ -1659,11 +1656,6 @@ void SvxFrameWindow_Impl::dispose() SfxPopupWindow::dispose(); } -vcl::Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow() -{ - return aFrameSet.get(); -} - void SvxFrameWindow_Impl::GetFocus() { if (aFrameSet) @@ -2043,28 +2035,11 @@ bool SvxLineWindow_Impl::Close() return SfxPopupWindow::Close(); } -vcl::Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() -{ - return m_aLineStyleLb.get(); -} - void SvxLineWindow_Impl::GetFocus() { m_aLineStyleLb->GrabFocus(); } -void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) -{ - SfxPopupWindow::DataChanged( rDCEvt ); -#if 0 - if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) - { - CreateBitmaps(); - Invalidate(); - } -#endif -} - SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, // Family-ID |