libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-03-02 22:55:41 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Merge pull request #9610 from jdgleaver/glui-refactors

Browse Source 
(GLUI) Menu improvements (Round 2)
This commit is contained in:
Twinaphex 2019-10-18 19:27:11 +02:00 committed by GitHub
commit 1c8d147d7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 747 additions and 471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1206
menu/drivers/materialui.c
View File

File diff suppressed because it is too large Load Diff

10
menu/menu_animation.c
View File

@ -33,6 +33,7 @@
#undef DG_DYNARR_IMPLEMENTATION
#include "menu_animation.h"
#include "menu_driver.h"
#include "../configuration.h"
#include "../performance_counters.h"
@ -1255,13 +1256,20 @@ static void menu_animation_update_time(bool timedate_enable, unsigned video_widt
* any kind of DPI scaling - i.e. text gets smaller
* as resolution increases. This is annoying. It
* means we have to use a fixed multiplier for
* Ozone as well... */
* Ozone as well...
* Note 3: GLUI uses the new DPI scaling system,
* so scaling multiplier is menu_display_get_dpi_scale()
* multiplied by a small correction factor (since the
* default 1.0x speed is just a little faster than the
* non-smooth ticker) */
if (string_is_equal(settings->arrays.menu_driver, "rgui"))
ticker_pixel_increment *= 0.25f;
/* TODO/FIXME: Remove this Ozone special case if/when
* Ozone gets proper DPI scaling */
else if (string_is_equal(settings->arrays.menu_driver, "ozone"))
ticker_pixel_increment *= 0.5f;
else if (string_is_equal(settings->arrays.menu_driver, "glui"))
ticker_pixel_increment *= (menu_display_get_dpi_scale(video_width, video_height) * 0.8f);
else if (video_width > 0)
ticker_pixel_increment *= ((float)video_width / 1920.0f);

2
retroarch.c
View File

@ -13283,6 +13283,8 @@ static int menu_input_pointer_post_iterate(
{
point.x = x;
point.y = y;
/* Note: menu_input->ptr is meaningless here when
* using a touchscreen... */
point.ptr = menu_input->ptr;
point.cbs = cbs;
point.entry = entry;