From f1cdd7a80727aeb40577361b02f92f13fdcea96a Mon Sep 17 00:00:00 2001 From: nfore Date: Sat, 8 Jul 2023 10:17:47 -0500 Subject: [PATCH] Fix overlay block_x_separation regression block_x_separation was being ignored by auto-scale --- tasks/task_overlay.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index 8185cdbe8e..0e593264da 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -835,6 +835,22 @@ static void task_overlay_deferred_load(retro_task_t *task) overlay->center_x = overlay->x + 0.5f * overlay->w; overlay->center_y = overlay->y + 0.5f * overlay->h; + /* Check whether x/y separation are force disabled + * for this overlay */ + strlcpy(conf_key + _len, "_block_x_separation", sizeof(conf_key) - _len); + if (config_get_bool(conf, conf_key, &tmp_bool) + && tmp_bool) + overlay->flags |= OVERLAY_BLOCK_X_SEPARATION; + else + overlay->flags &= ~OVERLAY_BLOCK_X_SEPARATION; + + strlcpy(conf_key + _len, "_block_y_separation", sizeof(conf_key) - _len); + if (config_get_bool(conf, conf_key, &tmp_bool) + && tmp_bool) + overlay->flags |= OVERLAY_BLOCK_Y_SEPARATION; + else + overlay->flags &= ~OVERLAY_BLOCK_Y_SEPARATION; + /* Check whether x/y separation are enabled * for this overlay in auto-scale mode */ strlcpy(conf_key + _len, "_auto_x_separation", sizeof(conf_key) - _len); @@ -856,23 +872,7 @@ static void task_overlay_deferred_load(retro_task_t *task) && tmp_bool) overlay->flags |= OVERLAY_AUTO_Y_SEPARATION; else - overlay->flags &= ~OVERLAY_AUTO_Y_SEPARATION; - - /* Check whether x/y separation are force disabled - * for this overlay */ - strlcpy(conf_key + _len, "_block_x_separation", sizeof(conf_key) - _len); - if (config_get_bool(conf, conf_key, &tmp_bool) - && tmp_bool) - overlay->flags |= OVERLAY_BLOCK_X_SEPARATION; - else - overlay->flags &= ~OVERLAY_BLOCK_X_SEPARATION; - - strlcpy(conf_key + _len, "_block_y_separation", sizeof(conf_key) - _len); - if (config_get_bool(conf, conf_key, &tmp_bool) - && tmp_bool) - overlay->flags |= OVERLAY_BLOCK_Y_SEPARATION; - else - overlay->flags &= ~OVERLAY_BLOCK_Y_SEPARATION; + overlay->flags &= ~OVERLAY_AUTO_Y_SEPARATION; } return;