diff options
author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2019-12-12 01:38:02 -0500 |
---|---|---|
committer | Ashod Nakashian <ashnakash@gmail.com> | 2019-12-25 17:44:32 +0100 |
commit | 0b3ad69c2c954dfaa91637116ffaf529115051dd (patch) | |
tree | 9738083f4c83b71c5a85da6285c9310b5fb675ae /sfx2 | |
parent | 6eef1937db49788ac55a1fd2df3f1e2505e27499 (diff) |
sfx2: sidebar: publish created notification on Mobile too
Reviewed-on: https://gerrit.libreoffice.org/85011
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 50af967b731495be6645f065fd11b9ad832a654a)
Change-Id: I59e5db039a6c1f29cb13e7c77a782659dbfb6894
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85786
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 5f731f6400a7..3484799196c9 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -79,28 +79,27 @@ public: pMobileNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message.c_str()); } } - else - { - // On desktop use the classic notifications. - const Point pos(m_rSidebarDockingWin.GetOutOffXPixel(), - m_rSidebarDockingWin.GetOutOffYPixel()); - const OString posMessage = pos.toString(); - const OString sizeMessage = m_rSidebarDockingWin.GetSizePixel().toString(); - const std::string message = OString(posMessage + sizeMessage).getStr(); - const vcl::LOKWindowId lokWindowId = m_rSidebarDockingWin.GetLOKWindowId(); + // Notify the sidebar is created, and its LOKWindowId, which + // is needed on both Mobile and Desktop. + const Point pos(m_rSidebarDockingWin.GetOutOffXPixel(), + m_rSidebarDockingWin.GetOutOffYPixel()); + const OString posMessage = pos.toString(); + const OString sizeMessage = m_rSidebarDockingWin.GetSizePixel().toString(); - if (lokWindowId != m_LastLOKWindowId || message != m_LastNotificationMessage) - { - m_LastLOKWindowId = lokWindowId; - m_LastNotificationMessage = message; + const std::string message = OString(posMessage + sizeMessage).getStr(); + const vcl::LOKWindowId lokWindowId = m_rSidebarDockingWin.GetLOKWindowId(); - std::vector<vcl::LOKPayloadItem> aItems; - aItems.emplace_back("type", "deck"); - aItems.emplace_back("position", posMessage); - aItems.emplace_back("size", sizeMessage); - pNotifier->notifyWindow(lokWindowId, "created", aItems); - } + if (lokWindowId != m_LastLOKWindowId || message != m_LastNotificationMessage) + { + m_LastLOKWindowId = lokWindowId; + m_LastNotificationMessage = message; + + std::vector<vcl::LOKPayloadItem> aItems; + aItems.emplace_back("type", "deck"); + aItems.emplace_back("position", posMessage); + aItems.emplace_back("size", sizeMessage); + pNotifier->notifyWindow(lokWindowId, "created", aItems); } } catch (boost::property_tree::json_parser::json_parser_error& rError) |