tyler/dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use larger text, update static strings

Browse Source
This commit is contained in:
Tyler Perkins 2021-12-19 20:05:50 -05:00
parent b0451e9f55
commit 3c12b19b9f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/config.cpp
View File

@ -31,6 +31,7 @@ size_t IMAGE_LOCATIONS_LENGTH = sizeof(IMAGE_LOCATIONS)/sizeof(IMAGE_LOCATIONS[0
//}; //};
const FONT_SIZE FONT_LOCATIONS[] = { const FONT_SIZE FONT_LOCATIONS[] = {
{ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }, { "Roboto_Mono/RobotoMono-Medium.ttf", 24 },
{ "Roboto_Mono/RobotoMono-Medium.ttf", 36 },
}; };
size_t FONT_LOCATIONS_LENGTH = sizeof(FONT_LOCATIONS)/sizeof(FONT_LOCATIONS[0]); size_t FONT_LOCATIONS_LENGTH = sizeof(FONT_LOCATIONS)/sizeof(FONT_LOCATIONS[0]);
@ -42,8 +43,8 @@ size_t FONT_LOCATIONS_LENGTH = sizeof(FONT_LOCATIONS)/sizeof(FONT_LOCATIONS[0]);
//}; //};
const FONT_SIZE_STRING CONST_STRINGS[] = { const FONT_SIZE_STRING CONST_STRINGS[] = {
//Weather strings //Weather strings
{ "Today's Weather", { "Roboto_Mono/RobotoMono-Medium.ttf", 24 } }, { "Today's Weather", { "Roboto_Mono/RobotoMono-Medium.ttf", 36 } },
{ "Sunny" , { "Roboto_Mono/RobotoMono-Medium.ttf", 24 } }, //{ "Sunny" , { "Roboto_Mono/RobotoMono-Medium.ttf", 24 } },
{ "Rainy" , { "Roboto_Mono/RobotoMono-Medium.ttf", 24 } }, //{ "Rainy" , { "Roboto_Mono/RobotoMono-Medium.ttf", 24 } },
}; };
size_t CONST_STRINGS_LENGTH = sizeof(CONST_STRINGS)/sizeof(CONST_STRINGS[0]); size_t CONST_STRINGS_LENGTH = sizeof(CONST_STRINGS)/sizeof(CONST_STRINGS[0]);

16
src/panel/weather.cpp
View File

@ -95,32 +95,32 @@ void weather::update_texture(){
//title //title
tgt.x = 50; tgt.x = 50;
tgt.y = 50; tgt.y = 50;
TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 36 }),
_rss.getTitle().c_str(), "Today's Weather",
&tgt.w, &tgt.h); &tgt.w, &tgt.h);
SDL_RenderCopy(board::getRenderer(), SDL_RenderCopy(board::getRenderer(),
board::getString(_rss.getTitle().c_str(), board::getString("Today's Weather",
{ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), NULL, &tgt); { "Roboto_Mono/RobotoMono-Medium.ttf", 36 }), NULL, &tgt);
//current weather //current weather
TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 36 }),
current_desc.c_str(), current_desc.c_str(),
&tgt.w, &tgt.h); &tgt.w, &tgt.h);
tgt.x = SCREEN_WIDTH / 2 - (tgt.w / 2); tgt.x = SCREEN_WIDTH / 2 - (tgt.w / 2);
tgt.y = SCREEN_HEIGHT / 2 - (tgt.h / 2); tgt.y = SCREEN_HEIGHT / 2 - (tgt.h / 2);
SDL_RenderCopy(board::getRenderer(), SDL_RenderCopy(board::getRenderer(),
board::getString(current_desc.c_str(), board::getString(current_desc.c_str(),
{ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), NULL, &tgt); { "Roboto_Mono/RobotoMono-Medium.ttf", 36 }), NULL, &tgt);
//tommorow's weather //tommorow's weather
TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 36 }),
tommorow_desc.c_str(), tommorow_desc.c_str(),
&tgt.w, &tgt.h); &tgt.w, &tgt.h);
tgt.x = SCREEN_WIDTH / 2 - (tgt.w / 2); tgt.x = SCREEN_WIDTH / 2 - (tgt.w / 2);
tgt.y = SCREEN_HEIGHT / 2 - (tgt.h / 2) + 30; tgt.y = SCREEN_HEIGHT / 2 - (tgt.h / 2) + 30;
SDL_RenderCopy(board::getRenderer(), SDL_RenderCopy(board::getRenderer(),
board::getString(tommorow_desc.c_str(), board::getString(tommorow_desc.c_str(),
{ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), NULL, &tgt); { "Roboto_Mono/RobotoMono-Medium.ttf", 36 }), NULL, &tgt);
SDL_SetRenderTarget(board::getRenderer(), NULL); SDL_SetRenderTarget(board::getRenderer(), NULL);
} }