Mercurial > public > ostc4

changeset 675:3c4a3d78ff2b Betatest

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix: Missing flip screen support for charge view The new charge view was not displayed correct in case the option "Flip screen" was selected. Drawing parameter have not been adapted to show the view correctly.
author Ideenmodellierer
date Wed, 30 Mar 2022 18:07:21 +0200
parents 8ebf7a27c189
children c855753af9a6
files Discovery/Src/t7.c
diffstat 1 files changed, 22 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Src/t7.c	Wed Mar 30 18:01:29 2022 +0200
+++ b/Discovery/Src/t7.c	Wed Mar 30 18:07:21 2022 +0200
@@ -3944,10 +3944,21 @@
 
     point_t start, stop;
 
+    SWindowGimpStyle wintemp;
+	SSettings* pSettings;
+	pSettings = settingsGetPointer();
+
     t7cY0free.WindowLineSpacing = 28 + 48 + 14;
     t7cY0free.WindowY0 = t7cH.WindowY0 - 5 - 2 * t7cY0free.WindowLineSpacing;
     t7cY0free.WindowNumberOfTextLines = 3;
 
+
+    if(pSettings->FlipDisplay)
+    {
+       	t7cY0free.WindowY0 = t7cH.WindowY0 + 15;
+        t7cY0free.WindowY1 = t7cY0free.WindowY0 + 250;
+    }
+
     localCharge = stateUsed->lifeData.battery_charge;
     if(localCharge < 0.0)
     {
@@ -3987,7 +3998,15 @@
     	indicator = '<';
     	hoursto100 = 1;
     }
-    t7cY0free.WindowY0 -= 52;
+
+    if(!pSettings->FlipDisplay)
+    {
+    	t7cY0free.WindowY0 -= 52;
+    }
+    else
+    {
+        	t7cY0free.WindowY1 += 52;
+    }
 
     if((stateUsed->lifeData.battery_charge > 0) && (stateUsed->chargeStatus != CHARGER_off))
     {
@@ -4006,12 +4025,6 @@
     }
     GFX_write_string(&FontT42, &t7cY0free, text, 1);
 
-    SWindowGimpStyle wintemp;
-	SSettings* pSettings;
-	pSettings = settingsGetPointer();
-
-
-
     wintemp.left = CUSTOMBOX_LINE_LEFT + CUSTOMBOX_INSIDE_OFFSET + 50;
     wintemp.right = wintemp.left + CUSTOMBOX_SPACE_INSIDE - 100;
 
@@ -4023,16 +4036,14 @@
     }
     else
     {
-    	wintemp.top = t7l1.WindowY1;
-    	wintemp.bottom = wintemp.top + 200;
+    	wintemp.top = t7l1.WindowY1 + 102;
+    	wintemp.bottom = wintemp.top + 100;
     }
 
     start.x =  wintemp.left-5;
-    //start.y =  wintemp.top + 100;
     start.y =  90;
 
     stop.x = wintemp.right + 5 - start.x;
-    //stop.y = wintemp.bottom - start.y;
     stop.y = 100;
     GFX_draw_box(&t7screen, start, stop,1, CLUT_Font020);