# HG changeset patch
# User Ideenmodellierer
# Date 1696863011 -7200
# Node ID 2a9a47547b05133f2c9f668c8fd273fa4cc9afb8
# Parent  d02a7e264d7254c21a654193a4bffafccfd038aa
Bugfix Flipscreen visualization:
In Timer and CCR overview the free custom fram coordinates were not initialized. Depending on which view was activ before the coordinates of the former view were used and sometimes resulting in a bad visualization. To fix the problem the coordinates are now initialized by the views.

The top menu bar text in the flip view did not consider spacings in the text position calculation causing an offset between color bar and text. The offset has been corrected.

diff -r d02a7e264d72 -r 2a9a47547b05 Discovery/Src/t7.c
--- a/Discovery/Src/t7.c	Mon Oct 09 15:10:10 2023 +0200
+++ b/Discovery/Src/t7.c	Mon Oct 09 16:50:11 2023 +0200
@@ -1960,8 +1960,8 @@
     t7cY0free.WindowNumberOfTextLines = 6;
     t7cY0free.WindowTab = 375;
 
-    t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
     if (!settings->FlipDisplay) {
+	    t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
         t7cY0free.WindowX0 += 10;
         t7cY0free.WindowY0 += 10;
         t7cY0free.WindowY1 = 355;
@@ -1969,6 +1969,7 @@
         t7cY0free.WindowX0 -= 10;
         t7cY0free.WindowY0 -= 10;
     } else {
+	    t7cY0free.WindowY1 = 400;
         t7cY0free.WindowY1 -= 10;
         t7cY0free.WindowX1 -= 10;
         GFX_write_string(&FontT24, &t7cY0free, heading, 1);
@@ -2113,8 +2114,8 @@
     t7cY0free.WindowNumberOfTextLines = 6;
     t7cY0free.WindowTab = 375;
 
-    t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
     if (!settings->FlipDisplay) {
+	    t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
         t7cY0free.WindowX0 += 10;
         t7cY0free.WindowY0 += 10;
         t7cY0free.WindowY1 = 355;
@@ -2122,6 +2123,7 @@
         t7cY0free.WindowX0 -= 10;
         t7cY0free.WindowY0 -= 10;
     } else {
+	    t7cY0free.WindowY1 = 400;
         t7cY0free.WindowY1 -= 10;
         t7cY0free.WindowX1 -= 10;
         GFX_write_string(&FontT24, &t7cY0free, heading, 1);
diff -r d02a7e264d72 -r 2a9a47547b05 Discovery/Src/tMenu.c
--- a/Discovery/Src/tMenu.c	Mon Oct 09 15:10:10 2023 +0200
+++ b/Discovery/Src/tMenu.c	Mon Oct 09 16:50:11 2023 +0200
@@ -1445,18 +1445,18 @@
 				}
 
 				pDestination -= (800) * 480;
-				positionText += 70;
+				positionText += 66;
 
 				if(((k == 4) && (actual_menu_content != MENU_SURFACE)) || ((k == 6) && (menu.pageCountNumber[5] == 0)))
 				{
 					pDestination -= 70 * 480;
-					positionText += 70;
+					positionText += 66;
 				}
 
 				if(spacing[k])
 				{
 					pDestination -= 35 * 480;
-					positionText += 35;
+					positionText += 31;
 				}
 			}
         }