summaryrefslogtreecommitdiffstats
path: root/src/emu/render.cpp
diff options
context:
space:
mode:
author Antonio Giner <calamity15khz@gmail.com>2016-08-27 16:30:38 +0200
committer Antonio Giner <calamity15khz@gmail.com>2016-08-27 22:12:29 +0200
commitdcc361c354c63762f2f5d57d2f2f62657904aac0 (patch)
tree4b23ba35f17f99cb98876d041ef281409998ca67 /src/emu/render.cpp
parentaa326bd8e6b98cb96fed1c668b61db7a4e74dc33 (diff)
Consistently apply -intscalex to the long dimension of the target
monitor, and -intscaley to the short dimension.
Diffstat (limited to 'src/emu/render.cpp')
-rw-r--r--src/emu/render.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index 85f4f17a1c3..7e2ad4c2ca1 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -1240,8 +1240,10 @@ void render_target::compute_visible_area(INT32 target_width, INT32 target_height
if (y_is_integer) yscale = std::min(maxyscale, std::max(1.0f, render_round_nearest(yscale)));
// check if we have user defined scale factors, if so use them instead
- xscale = m_int_scale_x > 0 ? m_int_scale_x : xscale;
- yscale = m_int_scale_y > 0 ? m_int_scale_y : yscale;
+ int user_scale_x = target_is_portrait? m_int_scale_y : m_int_scale_x;
+ int user_scale_y = target_is_portrait? m_int_scale_x : m_int_scale_y;
+ xscale = user_scale_x > 0 ? user_scale_x : xscale;
+ yscale = user_scale_y > 0 ? user_scale_y : yscale;
// set the final width/height
visible_width = render_round_nearest(src_width * xscale);