diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2016-12-27 17:58:09 +0100 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-05 09:36:54 +0000 |
| commit | 9152f16b7901af6bceaa296b8e0fc171ee5fe03c (patch) | |
| tree | e106a6fe6330e2d519a9e6555f7f36657a2147a7 /vcl | |
| parent | 4f55dedce3a618df65aacb536ec9902299e2e6d7 (diff) | |
tdf#102059 NotebookBar accessible using F6 key
Change-Id: I873c49d8c0557eb3702de921fb5d2281acfed526
Reviewed-on: https://gerrit.libreoffice.org/32459
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/notebookbar.cxx | 27 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx index 40e3f8480219..1a1de0208da8 100644 --- a/vcl/source/control/notebookbar.cxx +++ b/vcl/source/control/notebookbar.cxx @@ -10,6 +10,7 @@ #include <vcl/layout.hxx> #include <vcl/tabctrl.hxx> #include <vcl/notebookbar.hxx> +#include <vcl/taskpanelist.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/implbase.hxx> @@ -50,11 +51,27 @@ NotebookBar::~NotebookBar() void NotebookBar::dispose() { + if (m_pSystemWindow && m_pSystemWindow->ImplIsInTaskPaneList(this)) + { + m_pSystemWindow->GetTaskPaneList()->RemoveWindow(this); + m_pSystemWindow.clear(); + } disposeBuilder(); m_pEventListener.clear(); Control::dispose(); } +bool NotebookBar::PreNotify(NotifyEvent& rNEvt) +{ + // capture KeyEvents for taskpane cycling + if (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) + { + if (m_pSystemWindow) + return m_pSystemWindow->PreNotify(rNEvt); + } + return Window::PreNotify( rNEvt ); +} + Size NotebookBar::GetOptimalSize() const { if (isLayoutEnabled(this)) @@ -98,6 +115,16 @@ void NotebookBar::SetIconClickHdl(Link<NotebookBar*, void> aHdl) m_pContextContainer->SetIconClickHdl(aHdl); } +void NotebookBar::SetSystemWindow(SystemWindow* pSystemWindow) +{ + if (m_pSystemWindow) + m_pSystemWindow.clear(); + + m_pSystemWindow = VclPtr<SystemWindow>(pSystemWindow); + if (!m_pSystemWindow->ImplIsInTaskPaneList(this)) + m_pSystemWindow->GetTaskPaneList()->AddWindow(this); +} + void SAL_CALL NotebookBarContextChangeEventListener::notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) throw (css::uno::RuntimeException, std::exception) { diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index c96939df8724..21cdeb38ec54 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -979,6 +979,8 @@ void SystemWindow::SetNotebookBar(const OUString& rUIXMLDescription, const css:: { static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->SetNotebookBar(rUIXMLDescription, rFrame); maNotebookBarUIFile = rUIXMLDescription; + if(GetNotebookBar()) + GetNotebookBar()->SetSystemWindow(this); } } |