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

     MSG_DEBUG("User orientation: " << orientationToString((Qt::ScreenOrientation)currentOrientation));
 #else
     Q_UNUSED(currentOrientation);
 #endif
+}
 /**
  * @brief MainWindow::onPositionUpdated
  * This method is a callback function for the Qt framework. It is called
  * whenever the geo position changes. The position information is never really
  * used and is implemented only to keep the application on IOS running in the
 #endif
 /**
  * @brief Displays or hides a phone dialog window.
  * This method creates and displays a phone dialog window containing everything
  * a simple phone needs. Depending on the parameter \p state the dialog is
- * created or an exeisting dialog is closed.
+ * created or an existing dialog is closed.
  * @param state     If TRUE the dialog is created or if it is not visible
  * brought to front and is made visible.
  * If this is FALSE an existing dialog window is destroid and disappears. If
  * the window didn't exist nothing happens.
  */
 #endif
         break;
 #endif
         case Qt::ApplicationActive:
             MSG_INFO("Switched to mode ACTIVE");
-/*
-#ifdef Q_OS_ANDROID
-            // On Android we must give the surface some time to recover.
-            // Otherwise it may freeze or stay black and the app doesn't
-            // react any more.
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-#endif
-*/
             mHasFocus = true;
             if (!isRunning && gPageManager)
+            {
                 // Start the core application
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && defined(Q_OS_ANDROID)
                 _freezeWorkaround();
 #endif
 //                playShowList();
-//                if (mDoRepaint && mWasInactive)
+                if (mDoRepaint || mWasInactive)
-//                    repaintObjects();
+                    repaintObjects();
                 mDoRepaint = false;
                 mWasInactive = false;
+            }
 #ifdef Q_OS_ANDROID
 void MainWindow::_displayButton(ulong handle, ulong parent, TBitmap buffer, int width, int height, int left, int top, bool passthrough)
+{
     DECL_TRACER("MainWindow::_displayButton(ulong handle, ulong parent, TBitmap buffer, int width, int height, int left, int top, bool passthrough)");
-    if (prg_stopped || ! mHasFocus)
+    if (prg_stopped)
+        return;
+    if (!mHasFocus)
+    {
+        markDirty(handle);
         return;
+    }
 /*
     if (!mHasFocus)     // Suspended?
+    {
         addButton(handle, parent, buffer, left, top, width, height, passthrough);
         return;
 void MainWindow::_displayViewButton(ulong handle, ulong parent, bool vertical, TBitmap buffer, int width, int height, int left, int top, int space, TColor::COLOR_T fillColor)
+{
     DECL_TRACER("MainWindow::_displayViewButton(ulong handle, ulong parent, TBitmap buffer, int width, int height, int left, int top)");
-    if (prg_stopped || !mHasFocus)
+    if (prg_stopped)
+        return;
+    if (!mHasFocus)
+    {
+        markDirty(handle);
         return;
+    }
 /*
     if (!mHasFocus)     // Suspended?
+    {
         addViewButton(handle, parent, vertical, buffer, left, top, width, height, space, fillColor);
         return;
 void MainWindow::_addViewButtonItems(ulong parent, vector<PGSUBVIEWITEM_T> items)
+{
     DECL_TRACER("MainWindow::_addViewButtonItems(ulong parent, vector<PGSUBVIEWITEM_T> items)");
-    if (prg_stopped || !mHasFocus)
+    if (prg_stopped)
         return;
     emit sigAddViewButtonItems(parent, items);
+}
     DECL_TRACER("MainWindow::_updateViewButton(ulong handle, ulong parent, TBitmap buffer, TColor::COLOR_T fillColor)");
     if (prg_stopped || !mHasFocus)
         return;
-//    try
+    if (!mHasFocus)
-//    {
+    {
-        emit sigUpdateViewButton(handle, parent, buffer, fillColor);
+        markDirty(handle);
-//    }
+        return;
-//    catch (std::exception& e)
-//    {
+    }
-//        MSG_ERROR("Error triggering function \"updateViewButton()\": " << e.what());
+    emit sigUpdateViewButton(handle, parent, buffer, fillColor);
-//    }
+}
 void MainWindow::_updateViewButtonItem(PGSUBVIEWITEM_T& item, ulong parent)
+{
     DECL_TRACER("MainWindow::_updateViewButtonItem(PGSUBVIEWITEM_T& item, ulong parent)");
     if (prg_stopped || !mHasFocus)
         return;
-//    try
-//    {
-        emit sigUpdateViewButtonItem(item, parent);
+    emit sigUpdateViewButtonItem(item, parent);
-//    }
-//    catch (std::exception& e)
-//    {
-//        MSG_ERROR("Error triggering function \"updateViewButtonItem()\": " << e.what());
-//    }
+}
 void MainWindow::_showViewButtonItem(ulong handle, ulong parent, int position, int timer)
+{
     DECL_TRACER("MainWindow::_showViewButtonItem(ulong handle, ulong parent, int position, int timer)");
-    if (prg_stopped || !mHasFocus)
+    if (prg_stopped)
         return;
-//    try
+    if (!mHasFocus)
-//    {
+    {
-        emit sigShowViewButtonItem(handle, parent, position, timer);
+        markDirty(handle);
-//    }
+        return;
-//    catch (std::exception& e)
-//    {
+    }
-//        MSG_ERROR("Error triggering function \"showViewButtonItem()\": " << e.what());
+    emit sigShowViewButtonItem(handle, parent, position, timer);
-//    }
+}
 void MainWindow::_hideAllViewItems(ulong handle)
+{
     DECL_TRACER("MainWindow::_hideAllViewItems(ulong handle)");
 void MainWindow::_toggleViewButtonItem(ulong handle, ulong parent, int position, int timer)
+{
     DECL_TRACER("MainWindow::_toggleViewButtonItem(ulong handle, ulong parent, int position, int timer)");
-    if (prg_stopped || !mHasFocus)
+    if (prg_stopped)
+        return;
+    if (!mHasFocus)
+    {
+        markDirty(handle);
         return;
+    }
     emit sigToggleViewButtonItem(handle, parent, position, timer);
+}
 void MainWindow::_hideViewItem(ulong handle, ulong parent)
 void MainWindow::_setBackground(ulong handle, TBitmap image, int width, int height, ulong color, int opacity)
 #endif
+{
     DECL_TRACER("MainWindow::_setBackground(ulong handle, TBitmap image, int width, int height, ulong color [, int opacity])");
-    if (prg_stopped || !mHasFocus)
+    if (prg_stopped)
         return;
+    if (!mHasFocus)
+    {
+        markDirty(handle);
+        return;
+    }
 /*
     if (!mHasFocus)
+    {
 #ifdef _OPAQUE_SKIA_
         addBackground(handle, image, width, height, color);
+}
 void MainWindow::_dropButton(ulong handle)
+{
     DECL_TRACER("MainWindow::_dropButton(ulong handle)");
-/*
     if (!mHasFocus)
+    {
         markDrop(handle);
         return;
+    }
-*/
-    if (mHasFocus)
-        emit sigDropButton(handle);
+    emit sigDropButton(handle);
+}
 void MainWindow::_playVideo(ulong handle, ulong parent, int left, int top, int width, int height, const string& url, const string& user, const string& pw)
+{
     DECL_TRACER("MainWindow::_playVideo(ulong handle, const string& url)");
 void MainWindow::_showKeypad(const std::string& init, const std::string& prompt, bool priv)
+{
     DECL_TRACER("MainWindow::_showKeypad(std::string &init, std::string &prompt, bool priv)");
-    if (prg_stopped || mHasFocus)
+    if (prg_stopped || !mHasFocus)
         return;
     doReleaseButton();
     emit sigKeypad(init, prompt, priv);
+}
+    {
         MSG_WARNING("Invalid parameters for scroll area!");
         return;
+    }
-    if (mHasFocus)
+    if (!mHasFocus)
+    {
+        markDirty(handle);
+        return;
+    }
-        emit sigListViewArea(handle, parent, button, list);
+    emit sigListViewArea(handle, parent, button, list);
+}
 void MainWindow::doReleaseButton()
+{
     DECL_TRACER("MainWindow::doReleaseButton()");
+    }
+}
 /**
  * @brief MainWindow::repaintObjects
- * On a mobile device it is possible that the content, mostly the background, of
+ * If the application was suspended, which is only on mobile devices possible,
- * a window becomes destroyed and it is not repainted. This may be the case at
+ * the surface can't be drawn. If there was a change on a visible object it
- * the moment where the device was disconnected from the controller and
+ * was marked "dirty". This methos searches for all dirty marked objects and
- * reconnected while the application was inactive. In such a case usualy the
+ * asks the TPageManager to resend the last drawn graphic of the object. If the
- * surface is completely repainted. But because of inactivity this was not
+ * object was a page or subpage, the whole page or subpage is redrawn. Otherwise
- * possible and some components may look destroyed. They are still functional
- * allthough.
+ * only the changed object.
  */
 void MainWindow::repaintObjects()
+{
     DECL_TRACER("MainWindow::repaintObjects()");
-//    TLOCKER(draw_mutex);
-#ifdef Q_OS_ANDROID
-    std::this_thread::sleep_for(std::chrono::milliseconds(200));    // Necessary for slow devices
-#endif
-    TObject::OBJECT_t *obj = findFirstWindow();
+    TObject::OBJECT_t *obj = getFirstDirty();
     while (obj)
+    {
-        if (!obj->remove && !obj->invalid && obj->object.widget)
+        if (!obj->remove && !obj->invalid && obj->dirty)
+        {
             MSG_PROTOCOL("Refreshing widget " << handleToString (obj->handle));
+            if (gPageManager)
+                gPageManager->redrawObject(obj->handle);
-            obj->object.widget->repaint();
+            obj->dirty = false;
+        }
-        obj = findNextWindow(obj);
+        obj = getNextDirty(obj);
+    }
+}
 void MainWindow::refresh(ulong handle)
+{
         obj = findNextChild(obj->handle);
+    }
+}
+void MainWindow::markDirty(ulong handle)
+{
+    DECL_TRACER("MainWindow::markDirty(ulong handle)");
+    OBJECT_t *obj = findObject(handle);
+    if (!obj)
+        return;
+    MSG_DEBUG("Object " << handleToString(handle) << " marked dirty.");
+    obj->dirty = true;
+}
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 int MainWindow::calcVolume(int value)
 #else
 double MainWindow::calcVolume(int value)

Subversion Repositories tpanel

(root)/trunk/tqtmain.cpp @ 383 – Rev 369 → 383