mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu widgets) Should use MAX macro here from retro_miscellaneous.h

Browse Source
This commit is contained in:
twinaphex 2019-08-15 15:56:30 +02:00
parent a5f411ef5c
commit 111a7fea92
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/widgets/menu_widgets.c
View File

@ -36,15 +36,12 @@
#include <streams/file_stream.h> #include <streams/file_stream.h>
#include <formats/image.h> #include <formats/image.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include <retro_miscellaneous.h>
#ifndef PI #ifndef PI
#define PI 3.14159265359f #define PI 3.14159265359f
#endif #endif
#ifndef max
#define max(x, y) x >= y ? x : y
#endif
/* TODO: Fix context reset freezing everything in place (probably kills animations when it shouldn't anymore) */ /* TODO: Fix context reset freezing everything in place (probably kills animations when it shouldn't anymore) */
static float msg_queue_background[16] = COLOR_HEX_TO_FLOAT(0x3A3A3A, 1.0f); static float msg_queue_background[16] = COLOR_HEX_TO_FLOAT(0x3A3A3A, 1.0f);
@ -2218,7 +2215,7 @@ static void menu_widgets_start_achievement_notification()
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_animation_ctx_entry_t entry; menu_animation_ctx_entry_t entry;
cheevo_height = settings->floats.video_font_size * 4; cheevo_height = settings->floats.video_font_size * 4;
cheevo_width = max( cheevo_width = MAX(
font_driver_get_message_width(font_regular, msg_hash_to_str(MSG_ACHIEVEMENT_UNLOCKED), 0, 1), font_driver_get_message_width(font_regular, msg_hash_to_str(MSG_ACHIEVEMENT_UNLOCKED), 0, 1),
font_driver_get_message_width(font_regular, cheevo_title, 0, 1) font_driver_get_message_width(font_regular, cheevo_title, 0, 1)
); );