mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8671 from alfrix/new_batt_icons

Browse Source 
Ozone extra battery icons
This commit is contained in:
Twinaphex 2019-05-01 21:19:42 +02:00 committed by GitHub
commit 7cc7a6df75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/ozone/ozone.c
View File

@ -1019,7 +1019,7 @@ static void ozone_draw_header(ozone_handle_t *ozone, video_frame_info_t *video_i
ozone_draw_text(video_info, ozone, msg, video_info->width - 85, ozone->dimensions.header_height / 2 + FONT_SIZE_TIME * 3/8, TEXT_ALIGN_RIGHT, video_info->width, video_info->height, ozone->fonts.time, ozone->theme->text_rgba, false);
menu_display_blend_begin(video_info);
ozone_draw_icon(video_info, 92, 92, ozone->icons_textures[powerstate.charging ? OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_CHARGING : OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_FULL], video_info->width - 60 - 56, ozone->dimensions.header_height / 2 - 42, video_info->width, video_info->height, 0, 1, ozone->theme->entries_icon);
ozone_draw_icon(video_info, 92, 92, ozone->icons_textures[powerstate.charging? OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_CHARGING : (powerstate.percent > 80)? OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_FULL : (powerstate.percent > 60)? OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_80 : (powerstate.percent > 40)? OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_60 : (powerstate.percent > 20)? OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_40 : OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_20], video_info->width - 60 - 56, ozone->dimensions.header_height / 2 - 42, video_info->width, video_info->height, 0, 1, ozone->theme->entries_icon);
menu_display_blend_end(video_info);
}
}

8
menu/drivers/ozone/ozone_texture.c
View File

@ -532,6 +532,14 @@ switch (id)
return "battery-full.png";
case OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_CHARGING:
return "battery-charging.png";
case OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_80:
return "battery-80.png";
case OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_60:
return "battery-60.png";
case OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_40:
return "battery-40.png";
case OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_20:
return "battery-20.png";
case OZONE_ENTRIES_ICONS_TEXTURE_POINTER:
return "pointer.png";
case OZONE_ENTRIES_ICONS_TEXTURE_SAVESTATE:

4
menu/drivers/ozone/ozone_texture.h
View File

@ -138,6 +138,10 @@ enum
OZONE_ENTRIES_ICONS_TEXTURE_CLOCK,
OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_FULL,
OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_CHARGING,
OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_80,
OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_60,
OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_40,
OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_20,
OZONE_ENTRIES_ICONS_TEXTURE_POINTER,
OZONE_ENTRIES_ICONS_TEXTURE_ADD,
OZONE_ENTRIES_ICONS_TEXTURE_KEY,