Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2457cc01 authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "minui: Match API to AOSP" 

 * Breaks every device because of their deprecated graphics.c overloads.
 * Revert until we clean this mess up.

This reverts commit 48ccdcef.
parent 388e6a77

minui/graphics.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ void gr_font_size(int *x, int *y) 
    *y = gr_font->cheight;

}



int gr_text(int x, int y, const char *s, int bold)

int gr_text(int x, int y, const char *s)

{

    GGLContext *gl = gr_context;

    GRFont *font = gr_font;

minui/minui.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void gr_fb_blank(bool blank); 


void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a);

void gr_fill(int x1, int y1, int x2, int y2);

int gr_text(int x, int y, const char *s, int bold);

int gr_text(int x, int y, const char *s);

int gr_measure(const char *s);

void gr_font_size(int *x, int *y);

ui.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void draw_progress_locked() 
static void draw_text_line(int row, const char* t) {

  if (t[0] != '\0') {

    if (ui_get_rainbow_mode()) ui_rainbow_mode();

    gr_text(0, (row+1)*CHAR_HEIGHT-1, t, 0);

    gr_text(0, (row+1)*CHAR_HEIGHT-1, t);

  }

}