Miroirs/newrpl
1
0
Fork 0
mirror of https://git.code.sf.net/p/newrpl/sources synced 2024-11-16 19:51:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed displaying error message.

Browse source 
No battery indicator in single menu mode.
This commit is contained in:
claudiol 2021-02-04 12:00:57 -05:00
parent 0066c2de85
commit 2406d128ef
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
firmware/hal_battery_primeg1.c
View file

@ -92,6 +92,9 @@ void battery_handler()
if(!__bat_readcnt) { if(!__bat_readcnt) {
if(halScreen.Menu2==0) return; // Don't display battery in single menu mode
gglsurface scr; gglsurface scr;
ggl_initscr(&scr); ggl_initscr(&scr);

26
firmware/hal_screen_primeg1.c
View file

@ -1976,10 +1976,11 @@ void halRedrawAll(DRAWSURFACE * scr)
halRedrawStack(scr); halRedrawStack(scr);
if(halScreen.DirtyFlag & CMDLINE_ALLDIRTY) if(halScreen.DirtyFlag & CMDLINE_ALLDIRTY)
halRedrawCmdLine(scr); halRedrawCmdLine(scr);
if(halScreen.DirtyFlag & MENU1_DIRTY)
halRedrawMenu1(scr);
if(!halScreen.SAreaTimer) { if(!halScreen.SAreaTimer) {
// ONLY REDRAW IF THERE'S NO POPUP MESSAGES // ONLY REDRAW IF THERE'S NO POPUP MESSAGES
if(halScreen.DirtyFlag & MENU1_DIRTY)
halRedrawMenu1(scr);
if(halScreen.DirtyFlag & MENU2_DIRTY) if(halScreen.DirtyFlag & MENU2_DIRTY)
halRedrawMenu2(scr); halRedrawMenu2(scr);
if(halScreen.DirtyFlag & STAREA_DIRTY) if(halScreen.DirtyFlag & STAREA_DIRTY)
@ -2111,22 +2112,23 @@ void halShowErrorMsg()
} }
BINT ytop = BINT ytop =
halScreen.Form + halScreen.Stack + halScreen.CmdLine + halScreen.Form + halScreen.Stack + halScreen.CmdLine +1;
1; BINT ybot = ytop + halScreen.Menu1 + halScreen.Menu2 - 1;
// CLEAR MENU2 AND STATUS AREA // CLEAR MENU2 AND STATUS AREA
ggl_cliprect(&scr, 0, ytop, SCREEN_WIDTH - 1, ytop + halScreen.Menu2 - 1, ggl_cliprect(&scr, 0, ytop, SCREEN_WIDTH - 1, ybot,
0); 0);
// DO SOME DECORATIVE ELEMENTS // DO SOME DECORATIVE ELEMENTS
ggl_cliphline(&scr, ggl_cliphline(&scr,
ytop + (*halScreen.FontArray[FONT_STATUS])->BitmapHeight + 1, 0, ytop + (*halScreen.FontArray[FONT_STATUS])->BitmapHeight + 1, 0,
SCREEN_WIDTH - 1, ggl_mkcolor(8)); SCREEN_WIDTH - 1, ggl_mkcolor(8));
//ggl_cliphline(&scr,ytop+halScreen.Menu2-1,0,SCREEN_WIDTH-1,ggl_mkcolor(8)); //ggl_cliphline(&scr,ytop+halScreen.Menu2-1,0,SCREEN_WIDTH-1,ggl_mkcolor(8));
ggl_cliprect(&scr, 0, ytop, 4, ytop + halScreen.Menu2 - 1, ggl_mkcolor(8)); ggl_cliprect(&scr, 0, ytop, 4, ybot , ggl_mkcolor(8));
scr.clipx = 1; scr.clipx = 1;
scr.clipx2 = SCREEN_WIDTH - 2; scr.clipx2 = SCREEN_WIDTH - 2;
scr.clipy = ytop; scr.clipy = ytop;
scr.clipy2 = ytop + halScreen.Menu2 - 2; scr.clipy2 = ybot - 1;
// SHOW ERROR MESSAGE // SHOW ERROR MESSAGE
if(Exceptions != EX_ERRORCODE) { if(Exceptions != EX_ERRORCODE) {
@ -2230,16 +2232,18 @@ void halShowMsgN(char *Text, char *End)
BINT ytop = BINT ytop =
halScreen.Form + halScreen.Stack + halScreen.CmdLine + halScreen.Form + halScreen.Stack + halScreen.CmdLine +
1; 1;
BINT ybot = ytop + halScreen.Menu1 + halScreen.Menu2 - 1;
// CLEAR MENU2 AND STATUS AREA // CLEAR MENU2 AND STATUS AREA
ggl_cliprect(&scr, 0, ytop, SCREEN_WIDTH - 1, ytop + halScreen.Menu2 - 1, ggl_cliprect(&scr, 0, ytop, SCREEN_WIDTH - 1, ybot,
0); 0);
// DO SOME DECORATIVE ELEMENTS // DO SOME DECORATIVE ELEMENTS
ggl_cliphline(&scr, ytop + 1, 1, SCREEN_WIDTH - 2, ggl_mkcolor(8)); ggl_cliphline(&scr, ytop + 1, 1, SCREEN_WIDTH - 2, ggl_mkcolor(8));
ggl_cliphline(&scr, ytop + halScreen.Menu2 - 1, 1, SCREEN_WIDTH - 2, ggl_cliphline(&scr, ybot, 1, SCREEN_WIDTH - 2,
ggl_mkcolor(8)); ggl_mkcolor(8));
ggl_clipvline(&scr, 1, ytop + 2, ytop + halScreen.Menu2 - 2, ggl_clipvline(&scr, 1, ytop + 2, ybot - 1,
ggl_mkcolor(8)); ggl_mkcolor(8));
ggl_clipvline(&scr, SCREEN_WIDTH - 2, ytop + 2, ytop + halScreen.Menu2 - 2, ggl_clipvline(&scr, SCREEN_WIDTH - 2, ytop + 2, ybot - 1,
ggl_mkcolor(8)); ggl_mkcolor(8));
// SHOW MESSAGE // SHOW MESSAGE