mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement natinusala's commit - dropdown lists - fix checked attribute

Browse Source 
for ints, uints and floats
This commit is contained in:
twinaphex 2018-11-06 09:22:49 +01:00
parent 5984d16da9
commit 180bb3bdd2
2 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/drivers/ozone.c
View File

@ -1,8 +1,8 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis
* Copyright (C) 2014-2017 - Jean-André Santoni
* Copyright (C) 2014-2017 - Jean-André Santoni
* Copyright (C) 2016-2017 - Brad Parker
* Copyright (C) 2018 - Alfredo Monclús
* Copyright (C) 2018 - Alfredo Monclús
* Copyright (C) 2018 - natinusala
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
@ -2379,7 +2379,7 @@ static void ozone_draw_entry_value(ozone_handle_t *ozone,
if (checked)
{
menu_display_blend_begin(video_info);
ozone_draw_icon(video_info, 35, 35, ozone->theme->textures[OZONE_THEME_TEXTURE_CHECK], x - 25, y - 25, video_info->width, video_info->height, 0, 1, ozone->theme_dynamic.entries_checkmark);
ozone_draw_icon(video_info, 30, 30, ozone->theme->textures[OZONE_THEME_TEXTURE_CHECK], x - 20, y - 22, video_info->width, video_info->height, 0, 1, ozone->theme_dynamic.entries_checkmark);
menu_display_blend_end(video_info);
return;
}

64
menu/menu_displaylist.c
View File

@ -1,7 +1,7 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis
* Copyright (C) 2014-2017 - Jean-André Santoni
* Copyright (C) 2015-2017 - Andrés Suárez
* Copyright (C) 2014-2017 - Jean-André Santoni
* Copyright (C) 2015-2017 - Andrés Suárez
* Copyright (C) 2016-2017 - Brad Parker
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
@ -8125,11 +8125,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, val, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && val == orig_value)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
*setting->value.target.integer = orig_value;
@ -8150,11 +8151,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, val, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && val == orig_value)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
}
@ -8190,11 +8192,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, 0, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && fabs(i - orig_value) <= 0.01f)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
*setting->value.target.fraction = orig_value;
@ -8214,11 +8217,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, 0, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && fabs(i - orig_value) <= 0.01f)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
}
@ -8255,11 +8259,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, val, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && val == orig_value)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
*setting->value.target.unsigned_integer = orig_value;
@ -8280,11 +8285,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, val, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && val == orig_value)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
}
@ -8434,11 +8440,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, val, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && val == orig_value)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
*setting->value.target.integer = orig_value;
@ -8459,11 +8466,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, val, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && val == orig_value)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
}
@ -8499,11 +8507,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, 0, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && fabs(i - orig_value) <= 0.01f)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
*setting->value.target.fraction = orig_value;
@ -8523,11 +8532,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, 0, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && fabs(i - orig_value) <= 0.01f)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
}
@ -8564,11 +8574,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, val, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && val == orig_value)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
*setting->value.target.unsigned_integer = orig_value;
@ -8589,11 +8600,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_ITEMS,
setting_type, val, 0);
if (!checked_found && string_is_equal(val_s, setting->value.target.string))
if (!checked_found && val == orig_value)
{
checked = i;
checked = count;
checked_found = true;
}
count++;
}
}