Config popup menu UI tweaks

djphazer · Jan 22, 2024 · 8be3704 · 8be3704
1 parent c6a5563
commit 8be3704
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/software/src/APP_HEMISPHERE.h b/software/src/APP_HEMISPHERE.h
@@ -442,15 +442,20 @@ class HemisphereManager : public HSApplication {
             PokePopup(MENU_POPUP);
             // but still draw the applets
           }
+
+          if (!draw_applets && popup_type == MENU_POPUP) popup_tick = 0; // cancel popup
         }
-        else if (clock_setup) {
-          HS::clock_setup_applet.instance[0]->View();
-          draw_applets = false;
-        }
-        else if (help_hemisphere > -1) {
-          int index = my_applet[help_hemisphere];
-          HS::available_applets[index].instance[help_hemisphere]->BaseView();
-          draw_applets = false;
+
+        if (draw_applets) {
+          if (clock_setup) {
+            HS::clock_setup_applet.instance[0]->View();
+            draw_applets = false;
+          }
+          else if (help_hemisphere > -1) {
+            int index = my_applet[help_hemisphere];
+            HS::available_applets[index].instance[help_hemisphere]->BaseView();
+            draw_applets = false;
+          }
         }
 
         if (draw_applets) {
@@ -515,7 +520,10 @@ class HemisphereManager : public HSApplication {
                 if (preset_cursor) {
                     preset_cursor = 0;
                 }
-                else config_menu = 0;
+                else {
+                  config_menu = 0;
+                  popup_tick = 0;
+                }
             }
             return;
         }