fix refreshing by adding delays

Szybet · Oct 14, 2023 · 6bdbfdf · 6bdbfdf
1 parent e21a42e
commit 6bdbfdf
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/cardView/buttons/fourOptions.cpp b/cardView/buttons/fourOptions.cpp
@@ -2,6 +2,8 @@
 #include "global.h"
 #include "ui_fourOptions.h"
 
+#include <QTimer>
+
 fourOptions::fourOptions(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::fourOptions)
@@ -53,10 +55,18 @@ void fourOptions::on_showButton_clicked()
     emit show();
 }
 
+#define BUTTON_DELAY 650
+
 void fourOptions::showButtons() {
-    ui->stackedWidget->setCurrentIndex(0);
+    QTimer::singleShot(BUTTON_DELAY, this, [this]() {
+        QApplication::processEvents();
+        ui->stackedWidget->setCurrentIndex(0);
+    });
 }
 
 void fourOptions::hideButtons() {
-    ui->stackedWidget->setCurrentIndex(1);
+    QTimer::singleShot(BUTTON_DELAY, this, [this]() {
+        QApplication::processEvents();
+        ui->stackedWidget->setCurrentIndex(1);
+    });
 }
diff --git a/cardView/deckPlay.cpp b/cardView/deckPlay.cpp
@@ -239,14 +239,16 @@ void DeckPlay::setText(QTextBrowser* area, QString text) {
         previousFrontText = text;
     }
 
-    int finalWidth = area->width();
-    if(zoomFactor == 1.0) {
-        finalWidth = finalWidth - 50;
-    } else {
-        finalWidth = finalWidth * zoomFactor;
-    }
+    if(text.contains("<img") == true) {
+        int finalWidth = area->width();
+        if(zoomFactor == 1.0) {
+            finalWidth = finalWidth - 50;
+        } else {
+            finalWidth = finalWidth * zoomFactor;
+        }
 
-    text = adjustImgSize(finalWidth, text);
+        text = adjustImgSize(finalWidth, text);
+    }
 
     area->setHtml(text);
 
@@ -276,7 +278,7 @@ void DeckPlay::setText(QTextBrowser* area, QString text) {
     // Trying to fix some ghosting when in A2
     WaveForm currentWaveFormConverted = static_cast<WaveForm>(currentWaveForm);
     if(currentWaveFormConverted == WaveForm_A2) {
-        qDebug() << "Trying to fix ghosting";
+        qDebug() << "Check if ghost fix is needed";
         if(text.count() > 50) {
             QTimer::singleShot(500, this, [this, area, text]() {
                 if(area->horizontalScrollBar()->isVisible() || area->verticalScrollBar()->isVisible()) {

diff --git a/cardView/deckPlay.ui b/cardView/deckPlay.ui
@@ -107,7 +107,7 @@
            <x>0</x>
            <y>0</y>
            <width>710</width>
-           <height>517</height>
+           <height>518</height>
           </rect>
          </property>
          <property name="sizePolicy">

diff --git a/cardView/modes/boxes/boxes.cpp b/cardView/modes/boxes/boxes.cpp
@@ -6,6 +6,9 @@
 
 #include <QObject>
 #include <QDebug>
+
+#define SMALL_STATS_UPDATE_DELAY 2000
+
 boxes::boxes(QObject *parent)
     : QObject{parent}
 {
@@ -138,7 +141,7 @@ void boxes::loop() {
 
     // Before changing anything
     int whichBoxTmp = whichBox;
-    QTimer::singleShot(300, this, [this, whichBoxTmp]() {
+    QTimer::singleShot(SMALL_STATS_UPDATE_DELAY, this, [this, whichBoxTmp]() {
         cardStatUpdate(whichBoxTmp, 0);
     });
 }
@@ -174,7 +177,7 @@ void boxes::moveCard(int moveValue) {
 
     // Before changing anything
     int whichBoxTmp = whichBox;
-    QTimer::singleShot(300, this, [this, whichBoxTmp, moveValue]() {
+    QTimer::singleShot(SMALL_STATS_UPDATE_DELAY, this, [this, whichBoxTmp, moveValue]() {
         cardStatUpdate(whichBoxTmp, moveValue);
     });
 

diff --git a/inkbox_userapp/create.sh b/inkbox_userapp/create.sh
@@ -53,8 +53,8 @@ sshpass -p $passwd ssh $servername "bash -c \"sync\""
 sshpass -p $passwd ssh $servername "bash -c \"killall -9 sanki-debug.sh\"" || EXIT_CODE=0
 sshpass -p $passwd ssh $servername "bash -c \"killall -9 sanki.sh\"" || EXIT_CODE=0
 
-sshpass -p $passwd ssh $servername "bash -c \"rc-service inkbox_gui restart\"" # to get logs
-# sshpass -p $passwd ssh $servername "bash -c \"rc-service gui_apps restart\""
+# sshpass -p $passwd ssh $servername "bash -c \"rc-service inkbox_gui restart\"" # to get logs
+sshpass -p $passwd ssh $servername "bash -c \"rc-service gui_apps restart\""
 
 # To update main json
 # sshpass -p $passwd ssh $servername "bash -c \"touch /kobo/tmp/rescan_userapps\"" # This gets deleted by service restart