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

(Setting) Windowed scale should be an integer instead of float

Browse Source
This commit is contained in:
LibretroAdmin 2022-09-05 04:03:04 +02:00
parent c9ab8a6cbb
commit 84868ab21f
8 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command.c
View File

@ -1129,7 +1129,7 @@ bool command_event_resize_windowed_scale(settings_t *settings,
if (window_scale == 0)
return false;
configuration_set_float(settings, settings->floats.video_scale, (float)window_scale);
configuration_set_uint(settings, settings->uints.video_scale, window_scale);
if (!video_fullscreen)
command_event(CMD_EVENT_REINIT, NULL);

2
config.def.h
View File

@ -202,7 +202,7 @@
* Real x resolution = aspect * base_size * x scale
* Real y resolution = base_size * y scale
*/
#define DEFAULT_SCALE (3.0)
#define DEFAULT_SCALE 3
/* Fullscreen */

4
configuration.c
View File

@ -2054,7 +2054,6 @@ static struct config_float_setting *populate_settings_float(
return NULL;
SETTING_FLOAT("video_aspect_ratio", &settings->floats.video_aspect_ratio, true, DEFAULT_ASPECT_RATIO, false);
SETTING_FLOAT("video_scale", &settings->floats.video_scale, false, 0.0f, false);
SETTING_FLOAT("crt_video_refresh_rate", &settings->floats.crt_video_refresh_rate, true, DEFAULT_CRT_REFRESH_RATE, false);
SETTING_FLOAT("video_refresh_rate", &settings->floats.video_refresh_rate, true, DEFAULT_REFRESH_RATE, false);
SETTING_FLOAT("audio_rate_control_delta", audio_get_float_ptr(AUDIO_ACTION_RATE_CONTROL_DELTA), true, DEFAULT_RATE_CONTROL_DELTA, false);
@ -2174,6 +2173,7 @@ static struct config_uint_setting *populate_settings_uint(
SETTING_UINT("video_fullscreen_x", &settings->uints.video_fullscreen_x, true, DEFAULT_FULLSCREEN_X, false);
SETTING_UINT("video_fullscreen_y", &settings->uints.video_fullscreen_y, true, DEFAULT_FULLSCREEN_Y, false);
#endif
SETTING_UINT("video_scale", &settings->uints.video_scale, true, DEFAULT_SCALE, false);
SETTING_UINT("video_window_opacity", &settings->uints.video_window_opacity, true, DEFAULT_WINDOW_OPACITY, false);
#ifdef HAVE_VIDEO_LAYOUT
SETTING_UINT("video_layout_selected_view", &settings->uints.video_layout_selected_view, true, 0, false);
@ -2618,7 +2618,7 @@ void config_set_defaults(void *data)
#endif
#endif
settings->floats.video_scale = DEFAULT_SCALE;
settings->uints.video_scale = DEFAULT_SCALE;
video_driver_set_threaded(DEFAULT_VIDEO_THREADED);

2
configuration.h
View File

@ -210,6 +210,7 @@ typedef struct settings
unsigned video_monitor_index;
unsigned video_fullscreen_x;
unsigned video_fullscreen_y;
unsigned video_scale;
unsigned video_max_swapchain_images;
unsigned video_max_frame_latency;
unsigned video_swap_interval;
@ -336,7 +337,6 @@ typedef struct settings
struct
{
float placeholder;
float video_scale;
float video_aspect_ratio;
float video_refresh_rate;
float crt_video_refresh_rate;

8
gfx/video_driver.c
View File

@ -3362,7 +3362,7 @@ bool video_driver_init_internal(bool *video_is_threaded, bool verbosity_enabled)
}
else
{
float video_scale = settings->floats.video_scale;
unsigned video_scale = settings->uints.video_scale;
/* Determine maximum allowed window dimensions
* NOTE: We cannot read the actual display
* metrics here, because the context driver
@ -3397,12 +3397,12 @@ bool video_driver_init_internal(bool *video_is_threaded, bool verbosity_enabled)
* scale correctness. */
unsigned base_width = roundf(geom->base_height *
video_st->aspect_ratio);
width = roundf(base_width * video_scale);
width = base_width * video_scale;
}
else
width = roundf(geom->base_width * video_scale);
width = geom->base_width * video_scale;
height = roundf(geom->base_height * video_scale);
height = geom->base_height * video_scale;
/* Cap window size to maximum allowed values */
if ((width > max_win_width) || (height > max_win_height))

2
menu/menu_displaylist.c
View File

@ -8451,7 +8451,7 @@ unsigned menu_displaylist_build_list(
#else
{MENU_ENUM_LABEL_VIDEO_WINDOW_CUSTOM_SIZE_ENABLE, PARSE_ONLY_BOOL, true },
#endif
{MENU_ENUM_LABEL_VIDEO_SCALE, PARSE_ONLY_FLOAT, false},
{MENU_ENUM_LABEL_VIDEO_SCALE, PARSE_ONLY_UINT, false},
{MENU_ENUM_LABEL_VIDEO_WINDOW_WIDTH, PARSE_ONLY_UINT, false},
{MENU_ENUM_LABEL_VIDEO_WINDOW_HEIGHT, PARSE_ONLY_UINT, false},
{MENU_ENUM_LABEL_VIDEO_WINDOW_AUTO_WIDTH_MAX, PARSE_ONLY_UINT, false},

11
menu/menu_setting.c
View File

@ -8019,7 +8019,7 @@ static void general_write_handler(rarch_setting_t *setting)
{
settings_t *settings = config_get_ptr();
settings->modified = true;
settings->floats.video_scale = roundf(*setting->value.target.fraction);
settings->uints.video_scale = *setting->value.target.unsigned_integer;
if (!settings->bools.video_fullscreen)
rarch_cmd = CMD_EVENT_REINIT;
@ -8065,7 +8065,7 @@ static void general_write_handler(rarch_setting_t *setting)
{
settings_t *settings = config_get_ptr();
settings->modified = true;
settings->bools.video_hdr_expand_gamut = *setting->value.target.boolean;;
settings->bools.video_hdr_expand_gamut = *setting->value.target.boolean;
video_driver_set_hdr_expand_gamut(settings->bools.video_hdr_expand_gamut);
}
@ -12009,20 +12009,19 @@ static bool setting_append_list(
if (video_driver_has_windowed())
{
CONFIG_FLOAT(
CONFIG_UINT(
list, list_info,
&settings->floats.video_scale,
&settings->uints.video_scale,
MENU_ENUM_LABEL_VIDEO_SCALE,
MENU_ENUM_LABEL_VALUE_VIDEO_SCALE,
DEFAULT_SCALE,
"%.1fx",
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler);
(*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
menu_settings_list_current_add_range(list, list_info, 1.0, 10.0, 1.0, true, true);
menu_settings_list_current_add_range(list, list_info, 1, 10, 1, true, true);
SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
CONFIG_UINT(

2
ui/drivers/qt/qt_options.cpp
View File

@ -1299,7 +1299,7 @@ QWidget *VideoPage::widget()
aspectGroup->add(MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER);
aspectGroup->addRow(new AspectRatioGroup("Aspect Ratio"));
leftWindowedSizeForm->addRow("Scale:", new FloatSpinBox(MENU_ENUM_LABEL_VIDEO_SCALE));
leftWindowedSizeForm->addRow("Scale:", new UIntSpinBox(MENU_ENUM_LABEL_VIDEO_SCALE));
leftWindowedSizeForm->addRow("Max Width:", new UIntSpinBox(MENU_ENUM_LABEL_VIDEO_WINDOW_AUTO_WIDTH_MAX));
rightWindowedSizeForm->addRow("Opacity:", new UIntSpinBox(MENU_ENUM_LABEL_VIDEO_WINDOW_OPACITY));