mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

first pass at 12 hour clock mode

Browse source
This commit is contained in:
Shaun Inman 2023-01-14 15:29:02 -05:00
parent 1c2d50d730
commit 8531236d62
5 changed files with 150 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/common/api.c
View file

@ -136,6 +136,7 @@ static SDL_Rect asset_rects[] = {
[ASSET_PAGE] = (SDL_Rect){SCALE4(39,54, 6, 6)},
[ASSET_BAR] = (SDL_Rect){SCALE4(33,58, 4, 4)},
[ASSET_BAR_BG] = (SDL_Rect){SCALE4(15,55, 4, 4)},
[ASSET_UNDERLINE] = (SDL_Rect){SCALE4(85,51, 3, 3)},
[ASSET_DOT] = (SDL_Rect){SCALE4(33,54, 2, 2)},
[ASSET_BRIGHTNESS] = (SDL_Rect){SCALE4(23,33,19,19)},
@ -212,6 +213,7 @@ SDL_Surface* GFX_init(void) {
RGB_WHITE = SDL_MapRGB(gfx.screen->format, TRIAD_WHITE);
RGB_BLACK = SDL_MapRGB(gfx.screen->format, TRIAD_BLACK);
RGB_LIGHT_GRAY = SDL_MapRGB(gfx.screen->format, TRIAD_LIGHT_GRAY);
RGB_GRAY = SDL_MapRGB(gfx.screen->format, TRIAD_GRAY);
RGB_DARK_GRAY = SDL_MapRGB(gfx.screen->format, TRIAD_DARK_GRAY);
asset_rgbs[ASSET_WHITE_PILL] = RGB_WHITE;
@ -223,6 +225,7 @@ SDL_Surface* GFX_init(void) {
asset_rgbs[ASSET_PAGE] = RGB_BLACK;
asset_rgbs[ASSET_BAR] = RGB_WHITE;
asset_rgbs[ASSET_BAR_BG] = RGB_BLACK;
asset_rgbs[ASSET_UNDERLINE] = RGB_GRAY;
asset_rgbs[ASSET_DOT] = RGB_LIGHT_GRAY;
char asset_path[MAX_PATH];
@ -450,6 +453,55 @@ void GFX_blitABButtons(char* a, char* b, SDL_Surface* dst) {
}
}
int GFX_blitButtonGroup(char** pairs, SDL_Surface* dst, int align_right) {
int ox;
int oy;
int ow;
char* hint;
char* button;
struct Hint {
char* hint;
char* button;
int ow;
} hints[2];
int w = 0; // individual button dimension
int h = 0; // hints index
ow = 0; // full pill width
ox = align_right ? SCREEN_WIDTH - SCALE1(PADDING) : SCALE1(PADDING);
oy = SCREEN_HEIGHT - SCALE1(PADDING + PILL_SIZE);
for (int i=0; i<2; i++) {
if (!pairs[i*2]) break;
button = pairs[i * 2];
hint = pairs[i * 2 + 1];
w = GFX_getButtonWidth(hint, button);
hints[h].hint = hint;
hints[h].button = button;
hints[h].ow = w;
h += 1;
ow += SCALE1(BUTTON_MARGIN) + w;
}
ow += SCALE1(BUTTON_MARGIN);
if (align_right) ox -= ow;
GFX_blitPill(ASSET_DARK_GRAY_PILL, dst, &(SDL_Rect){
ox,
oy,
ow,
SCALE1(PILL_SIZE)
});
ox += SCALE1(BUTTON_MARGIN);
oy += SCALE1(BUTTON_MARGIN);
for (int i=0; i<h; i++) {
GFX_blitButton(hints[i].hint, hints[i].button, dst, &(SDL_Rect){ox,oy});
ox += hints[i].ow + SCALE1(BUTTON_MARGIN);
}
return ow;
}
///////////////////////////////
// based on picoarch's audio

3
src/common/api.h
View file

@ -28,6 +28,7 @@ void LOG_note(int level, const char* fmt, ...);
uint32_t RGB_WHITE;
uint32_t RGB_BLACK;
uint32_t RGB_LIGHT_GRAY;
uint32_t RGB_GRAY;
uint32_t RGB_DARK_GRAY;
enum {
@ -40,6 +41,7 @@ enum {
ASSET_PAGE,
ASSET_BAR,
ASSET_BAR_BG,
ASSET_UNDERLINE,
ASSET_DOT,
ASSET_COLORS,
@ -76,6 +78,7 @@ void GFX_blitBattery(SDL_Surface* dst, SDL_Rect* dst_rect);
int GFX_getButtonWidth(char* hint, char* button);
void GFX_blitButton(char* hint, char*button, SDL_Surface* dst, SDL_Rect* dst_rect);
void GFX_blitABButtons(char* a, char* b, SDL_Surface* dst);
int GFX_blitButtonGroup(char** hints, SDL_Surface* dst, int align_right);
///////////////////////////////

5
src/common/defines.h
View file

@ -47,17 +47,18 @@
#define TRIAD_WHITE 0xff,0xff,0xff
#define TRIAD_BLACK 0x00,0x00,0x00
#define TRIAD_LIGHT_GRAY 0x7f,0x7f,0x7f
#define TRIAD_GRAY 0x99,0x99,0x99
#define TRIAD_DARK_GRAY 0x26,0x26,0x26
#define TRIAD_LIGHT_TEXT 0xcc,0xcc,0xcc
#define TRIAD_DARK_TEXT 0x66,0x66,0x66
#define TRIAD_BUTTON_TEXT 0x99,0x99,0x99
#define COLOR_WHITE (SDL_Color){TRIAD_WHITE}
#define COLOR_GRAY (SDL_Color){TRIAD_GRAY}
#define COLOR_BLACK (SDL_Color){TRIAD_BLACK}
#define COLOR_LIGHT_TEXT (SDL_Color){TRIAD_LIGHT_TEXT}
#define COLOR_DARK_TEXT (SDL_Color){TRIAD_DARK_TEXT}
#define COLOR_BUTTON_TEXT (SDL_Color){TRIAD_BUTTON_TEXT}
#define COLOR_BUTTON_TEXT (SDL_Color){TRIAD_GRAY}
#define SCREEN_WIDTH 640
#define SCREEN_HEIGHT 480