Mercurial > public > ostc4

changeset 825:4bd8935f5176

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Ideenmodellierer
date Mon, 09 Oct 2023 16:50:11 +0200
parents dff26bf4b542
children 61f14abce25d
files Discovery/Src/t7.c Discovery/Src/tMenu.c
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Src/t7.c	Mon Oct 09 11:23:27 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);
--- a/Discovery/Src/tMenu.c	Mon Oct 09 11:23:27 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;
 				}
 			}
         }