summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2019-10-30 06:12:26 -0400
committerAshod Nakashian <ashnakash@gmail.com>2019-10-31 11:56:54 +0100
commita7dd46575d10dfdfdfa8b51976de1d67210e81e7 (patch)
tree7a595504e4fccdd49a823d490eae30df462190ee /sfx2
parent4719c2635b933c0b3a9e68478e21ada022dea057 (diff)
sidebars: add JSDialog support to sidebars
Currently the JSDialog path is only for mobile and we use the passive notifications for desktop Online. Change-Id: I5d26fee9475ede665f269ca1f7b582455be08e50 Reviewed-on: https://gerrit.libreoffice.org/81754 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.cxx58
1 files changed, 52 insertions, 6 deletions
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 799c0ec712e6..a0ed9440180d 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -28,12 +28,61 @@
#include <tools/gen.hxx>
#include <vcl/event.hxx>
#include <comphelper/lok.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+
+#include <boost/property_tree/json_parser.hpp>
using namespace css;
using namespace css::uno;
namespace sfx2 { namespace sidebar {
+class SidebarNotifyIdle : public Idle
+{
+ SidebarDockingWindow &mrSidebarDockingWin;
+
+public:
+ SidebarNotifyIdle(SidebarDockingWindow &rSidebarDockingWin) :
+ Idle("Sidebar notify"),
+ mrSidebarDockingWin(rSidebarDockingWin)
+ {
+ SetPriority(TaskPriority::POST_PAINT);
+ }
+
+ void Invoke() override
+ {
+ auto pNotifier = mrSidebarDockingWin.GetLOKNotifier();
+ if (!pNotifier || !comphelper::LibreOfficeKit::isActive())
+ return;
+
+ try
+ {
+ if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+ {
+ // Mobile.
+ std::stringstream aStream;
+ boost::property_tree::write_json(aStream, mrSidebarDockingWin.DumpAsPropertyTree());
+ pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, aStream.str().c_str());
+ }
+ else
+ {
+ // On desktop use the classic notifications.
+ std::vector<vcl::LOKPayloadItem> aItems;
+ aItems.emplace_back("type", "deck");
+ const Point pos = Point(mrSidebarDockingWin.GetOutOffXPixel(),
+ mrSidebarDockingWin.GetOutOffYPixel());
+ aItems.emplace_back("position", pos.toString());
+ aItems.emplace_back("size", mrSidebarDockingWin.GetSizePixel().toString());
+ pNotifier->notifyWindow(mrSidebarDockingWin.GetLOKWindowId(), "created", aItems);
+ }
+ }
+ catch (boost::property_tree::json_parser::json_parser_error& rError)
+ {
+ SAL_WARN("sfx.sidebar", rError.message());
+ }
+ }
+};
+
SidebarDockingWindow::SidebarDockingWindow(SfxBindings* pSfxBindings, SidebarChildWindow& rChildWindow,
vcl::Window* pParentWindow, WinBits nBits)
: SfxDockingWindow(pSfxBindings, &rChildWindow, pParentWindow, nBits)
@@ -41,6 +90,7 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings* pSfxBindings, SidebarChi
, mbIsReadyToDrag(false)
, mbSidebarVisibleInLOK(rChildWindow.IsSidebarVisibleInLOK())
, mpOldViewShell(SfxViewShell::Current())
+ , mpIdleNotify(new SidebarNotifyIdle(*this))
{
// Get the XFrame from the bindings.
if (pSfxBindings==nullptr || pSfxBindings->GetDispatcher()==nullptr)
@@ -125,13 +175,9 @@ void SidebarDockingWindow::NotifyResize()
if (mpSidebarController.is() && !GetLOKNotifier())
SetLOKNotifier(SfxViewShell::Current());
- if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+ if (GetLOKNotifier())
{
- std::vector<vcl::LOKPayloadItem> aItems;
- aItems.emplace_back("type", "deck");
- aItems.emplace_back(std::make_pair("position", Point(GetOutOffXPixel(), GetOutOffYPixel()).toString()));
- aItems.emplace_back(std::make_pair("size", GetSizePixel().toString()));
- pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
+ mpIdleNotify->Start();
}
}
}