mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

* (gfx_widgets) ptr_width >= ptr_height - equal would just mean setting ptr_width to

Browse Source 
the same value, so turn it into 'greater than' instead
* Avoid some tertiary operators where we just set the variable back to its
own value
This commit is contained in:
libretroadmin 2022-07-09 13:00:50 +02:00
parent 4d3587a2e8
commit c2f618d394
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/gfx_display.c
View File

@ -1020,7 +1020,7 @@ int gfx_display_osk_ptr_at_pos(void *data, int x, int y,
int ptr_width = width / 11;
int ptr_height = height / 10;
if (ptr_width >= ptr_height)
if (ptr_width > ptr_height)
ptr_width = ptr_height;
for (i = 0; i < 44; i++)
@ -1116,7 +1116,7 @@ void gfx_display_draw_keyboard(
ptr_width = video_width / 11;
ptr_height = video_height / 10;
if (ptr_width >= ptr_height)
if (ptr_width > ptr_height)
ptr_width = ptr_height;
for (i = 0; i < 44; i++)

3
gfx/gfx_widgets.c
View File

@ -1645,7 +1645,8 @@ void gfx_widgets_frame(void *data)
- p_dispwidget->simple_widget_padding - text_width;
/* Ensure that left hand side of text does
* not bleed off the edge of the screen */
status_text_x = (status_text_x < 0) ? 0 : status_text_x;
if (status_text_x < 0)
status_text_x = 0;
gfx_display_set_alpha(p_dispwidget->backdrop_orig, DEFAULT_BACKDROP);

40
gfx/video_driver.c
View File

@ -1180,15 +1180,17 @@ void video_switch_refresh_rate_maybe(
bool all_fullscreen = settings->bools.video_fullscreen || settings->bools.video_windowed_fullscreen;
/* Roundings to PAL & NTSC standards */
refresh_rate = (refresh_rate > 54 && refresh_rate < 60) ? 59.94f : refresh_rate;
refresh_rate = (refresh_rate > 49 && refresh_rate < 55) ? 50.00f : refresh_rate;
if (refresh_rate > 54 && refresh_rate < 60)
refresh_rate = 59.94f;
else if (refresh_rate > 49 && refresh_rate < 55)
refresh_rate = 50.00f;
/* Black frame insertion + swap interval multiplier */
refresh_rate = (refresh_rate * (video_bfi + 1.0f) * video_swap_interval);
refresh_rate = (refresh_rate * (video_bfi + 1.0f) * video_swap_interval);
/* Fallback when target refresh rate is not exposed or when below standards */
if (!video_display_server_has_refresh_rate(refresh_rate) || refresh_rate < 50)
refresh_rate = video_refresh_rate;
refresh_rate = video_refresh_rate;
*refresh_rate_suggest = refresh_rate;
@ -1203,10 +1205,10 @@ void video_switch_refresh_rate_maybe(
* - 'CRT SwitchRes' OFF & 'Sync to Exact Content Framerate' OFF
* - Automatic refresh rate switching not OFF
*/
if (refresh_rate != video_refresh_rate &&
!crt_switch_resolution &&
!vrr_runloop_enable &&
(autoswitch_refresh_rate != AUTOSWITCH_REFRESH_RATE_OFF))
if ( refresh_rate != video_refresh_rate
&& !crt_switch_resolution
&& !vrr_runloop_enable
&& (autoswitch_refresh_rate != AUTOSWITCH_REFRESH_RATE_OFF))
{
*video_switch_refresh_rate = (
((autoswitch_refresh_rate == AUTOSWITCH_REFRESH_RATE_EXCLUSIVE_FULLSCREEN) && exclusive_fullscreen) ||
@ -3346,7 +3348,7 @@ bool video_driver_init_internal(bool *video_is_threaded, bool verbosity_enabled)
settings->uints.window_position_width &&
settings->uints.window_position_height)
{
width = settings->uints.window_position_width;
width = settings->uints.window_position_width;
height = settings->uints.window_position_height;
}
else
@ -3396,26 +3398,30 @@ bool video_driver_init_internal(bool *video_is_threaded, bool verbosity_enabled)
/* Cap window size to maximum allowed values */
if ((width > max_win_width) || (height > max_win_height))
{
unsigned geom_width = (width > 0) ? width : 1;
unsigned geom_width = (width > 0) ? width : 1;
unsigned geom_height = (height > 0) ? height : 1;
float geom_aspect = (float)geom_width / (float)geom_height;
float geom_aspect = (float)geom_width / (float)geom_height;
float max_win_aspect = (float)max_win_width / (float)max_win_height;
if (geom_aspect > max_win_aspect)
{
width = max_win_width;
width = max_win_width;
height = geom_height * max_win_width / geom_width;
/* Account for any possible rounding errors... */
height = (height < 1) ? 1 : height;
height = (height > max_win_height) ? max_win_height : height;
if (height < 1)
height = 1;
else if (height > max_win_height)
height = max_win_height;
}
else
{
height = max_win_height;
width = geom_width * max_win_height / geom_height;
width = geom_width * max_win_height / geom_height;
/* Account for any possible rounding errors... */
width = (width < 1) ? 1 : width;
width = (width > max_win_width) ? max_win_width : width;
if (width < 1)
width = 1;
else if (width > max_win_width)
width = max_win_width;
}
}
}