WebSVN – tpanel – Diff – /trunk/tqtmain.cpp

     gPageManager->regSetPhoneStatus(bind(&MainWindow::_setPhoneStatus, this, std::placeholders::_1));
     gPageManager->regSetPhoneState(bind(&MainWindow::_setPhoneState, this, std::placeholders::_1, std::placeholders::_2));
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
     gPageManager->regOnOrientationChange(bind(&MainWindow::_orientationChanged, this, std::placeholders::_1));
 #endif
+    gPageManager->regRepaintWindows(bind(&MainWindow::_repaintWindows, this));
     gPageManager->deployCallbacks();
     createActions();
 #ifndef QT_NO_SESSIONMANAGER
     QGuiApplication::setFallbackSessionManagementEnabled(false);
         connect(this, &MainWindow::sigSendVirtualKeys, this, &MainWindow::sendVirtualKeys);
         connect(this, &MainWindow::sigShowPhoneDialog, this, &MainWindow::showPhoneDialog);
         connect(this, &MainWindow::sigSetPhoneNumber, this, &MainWindow::setPhoneNumber);
         connect(this, &MainWindow::sigSetPhoneStatus, this, &MainWindow::setPhoneStatus);
         connect(this, &MainWindow::sigSetPhoneState, this, &MainWindow::setPhoneState);
+        connect(this, &MainWindow::sigRepaintWindows, this, &MainWindow::repaintWindows);
         connect(qApp, &QGuiApplication::applicationStateChanged, this, &MainWindow::appStateChanged);
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
         QScreen *screen = QGuiApplication::primaryScreen();
         connect(screen, &QScreen::orientationChanged, this, &MainWindow::onScreenOrientationChanged);
 #endif
             _setOrientation((J_ORIENTATION)orientation);
+    }
+}
 #endif
+void MainWindow::_repaintWindows()
+{
+    DECL_TRACER("MainWindow::_repaintWindows()");
+    emit repaintWindows();
+}
 /**
  * @brief MainWindow::closeEvent called when the application receives an exit event.
+ *
  * If the user clicks on the exit icon or on the menu point _Exit_ this method
  * is called. It makes sure everything is written to the configuration file
     std::string msg = "Simulation of an AMX G4 panel\n";
     msg.append("Version v").append(VERSION_STRING()).append("\n");
     msg.append("(C) Copyright 2020 to 2022 by Andreas Theofilu <andreas@theosys.at>\n");
     msg.append("This program is under the terms of GPL version 3");
-    QMessageBox::about(this, tr(std::string("About ").append(TConfig::getProgName()).c_str()),
+    QMessageBox::about(this, tr("About TPanel"),
                        tr(msg.c_str()));
+}
 void MainWindow::arrowUp()
+{
     if (gPageManager)
         gPageManager->setTextToButton(obj->handle, text.toStdString());
+}
+void MainWindow::repaintWindows()
+{
+    DECL_TRACER("MainWindow::repaintWindows()");
+    if (mWasInactive)
+        mDoRepaint = true;
+}
 /**
  * @brief MainWindow::appStateChanged - Is called whenever the state of the app changes.
  * This callback method is called whenever the state of the application
  * changes. This is mostly usefull on mobile devices. Whenever the main window
  * looses the focus (screen closed, application is put into background, ...)
         break;
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)      // On a normal desktop we can ignore this signals
         case Qt::ApplicationInactive:
             MSG_INFO("Switched to mode INACTIVE");
             mHasFocus = false;
+            mWasInactive = true;
             QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Orientation", "pauseOrientationListener", "()V");
         break;
         case Qt::ApplicationHidden:
             MSG_INFO("Switched to mode HIDDEN");
+            {
                 // Start the core application
                 gPageManager->startUp();
                 gPageManager->run();
                 isRunning = true;
+                mWasInactive = false;
+            }
             else
+            {
                 playShowList();
+                if (mDoRepaint && mWasInactive)
+                    repaintObjects();
+                mDoRepaint = false;
+                mWasInactive = false;
+            }
 #ifdef Q_OS_ANDROID
             QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Orientation", "resumeOrientationListener", "()V");
 #endif
         break;
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
+    }
     mLastPressX = mLastPressY = -1;
+}
+/**
+ * @brief MainWindow::repaintObjects
+ * On a mobile device it is possible that the content, mostly the background, of
+ * a window becomes destroyed and it is not repainted. This may be the case at
+ * the moment where the device was disconnected from the controller and
+ * reconnected while the application was inactive. In such a case usualy the
+ * surface is completely repainted. But because of inactivity this was not
+ * possible and some components may look destroyed. They are still functional
+ * allthough.
+ */
+void MainWindow::repaintObjects()
+{
+    DECL_TRACER("MainWindow::repaintObjects()");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        return;
+    }
+    draw_mutex.lock();
+    TObject::OBJECT_t *obj = gObject->findFirstWindow();
+    while (obj)
+    {
+        if (!obj->remove && obj->object.widget)
+            obj->object.widget->repaint();
+        obj = gObject->findNextWindow(obj);
+    }
+    draw_mutex.unlock();
+}
 int MainWindow::calcVolume(int value)
+{
     DECL_TRACER("TQtSettings::calcVolume(int value)");
     // volumeSliderValue is in the range [0..100]

Subversion Repositories tpanel

(root)/trunk/tqtmain.cpp @ 143 – Rev 141 → 142