From 3c12b19b9f3a704a73a20a17fadd812c63dc7a96 Mon Sep 17 00:00:00 2001 From: Tyler Perkins Date: Sun, 19 Dec 2021 20:05:50 -0500 Subject: [PATCH] Use larger text, update static strings --- src/config.cpp | 7 ++++--- src/panel/weather.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 25c2b35..92c6381 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -31,6 +31,7 @@ size_t IMAGE_LOCATIONS_LENGTH = sizeof(IMAGE_LOCATIONS)/sizeof(IMAGE_LOCATIONS[0 //}; const FONT_SIZE FONT_LOCATIONS[] = { { "Roboto_Mono/RobotoMono-Medium.ttf", 24 }, + { "Roboto_Mono/RobotoMono-Medium.ttf", 36 }, }; 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[] = { //Weather strings - { "Today's Weather", { "Roboto_Mono/RobotoMono-Medium.ttf", 24 } }, - { "Sunny" , { "Roboto_Mono/RobotoMono-Medium.ttf", 24 } }, - { "Rainy" , { "Roboto_Mono/RobotoMono-Medium.ttf", 24 } }, + { "Today's Weather", { "Roboto_Mono/RobotoMono-Medium.ttf", 36 } }, + //{ "Sunny" , { "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]); diff --git a/src/panel/weather.cpp b/src/panel/weather.cpp index f74f522..d73b84a 100644 --- a/src/panel/weather.cpp +++ b/src/panel/weather.cpp @@ -95,32 +95,32 @@ void weather::update_texture(){ //title tgt.x = 50; tgt.y = 50; - TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), - _rss.getTitle().c_str(), + TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 36 }), + "Today's Weather", &tgt.w, &tgt.h); SDL_RenderCopy(board::getRenderer(), - board::getString(_rss.getTitle().c_str(), - { "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), NULL, &tgt); + board::getString("Today's Weather", + { "Roboto_Mono/RobotoMono-Medium.ttf", 36 }), NULL, &tgt); //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(), &tgt.w, &tgt.h); tgt.x = SCREEN_WIDTH / 2 - (tgt.w / 2); tgt.y = SCREEN_HEIGHT / 2 - (tgt.h / 2); SDL_RenderCopy(board::getRenderer(), 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 - TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 24 }), + TTF_SizeText(board::getFont({ "Roboto_Mono/RobotoMono-Medium.ttf", 36 }), tommorow_desc.c_str(), &tgt.w, &tgt.h); tgt.x = SCREEN_WIDTH / 2 - (tgt.w / 2); tgt.y = SCREEN_HEIGHT / 2 - (tgt.h / 2) + 30; SDL_RenderCopy(board::getRenderer(), 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); }