Show app screen by re-launch in nativeqt app

:Release Notes: Show app screen by re-launch in nativeqt app :Detailed Notes: - When receiving re-launch, the app is not shown full screen. - Call showFullScreen() to make the app is shown.
webosose · Jun 17, 2021 · 86098ee · 86098ee
1 parent b6f105f
commit 86098ee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/native-apps/built-in/com.example.app.nativeqt/ServiceRequest.cpp b/native-apps/built-in/com.example.app.nativeqt/ServiceRequest.cpp
@@ -33,11 +33,12 @@ static std::string convertJsonToString(const pbnjson::JValue json)
     return pbnjson::JGenerator::serialize(json, pbnjson::JSchemaFragment("{}"));
 }
 
-ServiceRequest::ServiceRequest(std::string appId)
+ServiceRequest::ServiceRequest(std::string appId, QWindow &window)
     : m_mainLoop(g_main_loop_new(nullptr, false))
     , m_serviceHandle(nullptr)
 {
     m_appId = appId;
+    m_window = &window;
     m_serviceHandle = acquireHandle();
 }
 
@@ -83,7 +84,7 @@ void ServiceRequest::clearHandle()
     }
 }
 
-static bool registerAppCallback(LSHandle* sh, LSMessage* msg, void* ctx)
+static bool registerAppCallback(LSHandle* sh, LSMessage* msg, void* context)
 {
     PmLogInfo(getPmLogContext(), "REGISTER_CALLBACK", 1, PMLOGJSON("payload", LSMessageGetPayload(msg)),  " ");
 
@@ -100,6 +101,11 @@ static bool registerAppCallback(LSHandle* sh, LSMessage* msg, void* ctx)
         }
         else if (event == "relaunch")
         {
+            //relaunch screen
+            if (context != nullptr)
+            {
+                ((ServiceRequest*)context)->m_window->showFullScreen();
+            }
             //handle "relaunch" event
             if (response.hasKey("parameters"))
             {
@@ -136,7 +142,7 @@ void ServiceRequest::registerApp()
                 "luna://com.webos.service.applicationmanager/registerApp",
                 "{}",
                 registerAppCallback,
-                NULL,
+                this,
                 NULL,
                 &lserror))
     {

diff --git a/native-apps/built-in/com.example.app.nativeqt/ServiceRequest.h b/native-apps/built-in/com.example.app.nativeqt/ServiceRequest.h
@@ -22,6 +22,7 @@
 #include <luna-service2/lunaservice.h>
 #include <pbnjson.hpp>
 #include <PmLog.h>
+#include <QtGui/QWindow>
 
 static PmLogContext getPmLogContext()
 {
@@ -36,10 +37,11 @@ static PmLogContext getPmLogContext()
 class ServiceRequest
 {
 public:
-    ServiceRequest(std::string appId);
+    ServiceRequest(std::string appId, QWindow &window);
     virtual ~ServiceRequest();
     LSHandle* getHandle() const { return m_serviceHandle; }
     void registerApp();
+    QWindow* m_window;
 
 protected:
     LSHandle* acquireHandle();

diff --git a/native-apps/built-in/com.example.app.nativeqt/main.cpp b/native-apps/built-in/com.example.app.nativeqt/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
     window.resize(screenGeometry.width(), screenGeometry.height());
     window.show();
 
-    ServiceRequest s_request("com.example.app.nativeqt");
+    ServiceRequest s_request("com.example.app.nativeqt", window);
     s_request.registerApp();
 
     QGuiApplication::platformNativeInterface()->setWindowProperty(window.handle(), "appId", "com.example.app.nativeqt");