diff options
author | Antonio Giner <estudio@antonioginer.com> | 2016-03-19 00:02:41 +0100 |
---|---|---|
committer | Antonio Giner <estudio@antonioginer.com> | 2016-03-19 00:02:41 +0100 |
commit | 57199a7dff8d53f88951a08dc0f8fbff9d11ad8d (patch) | |
tree | f5e8cc22673a1cf260f12354245ca175163be102 /src/osd/windows/window.cpp | |
parent | e39daaf5bdcf21d64abf239e1133963643dc6df1 (diff) |
Revert changes in layout view prior to rework of integer scaling
Diffstat (limited to 'src/osd/windows/window.cpp')
-rw-r--r-- | src/osd/windows/window.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp index c6fd834b17f..e0089d98585 100644 --- a/src/osd/windows/window.cpp +++ b/src/osd/windows/window.cpp @@ -1663,7 +1663,7 @@ osd_rect win_window_info::constrain_to_aspect_ratio(const osd_rect &rect, int ad assert(GetCurrentThreadId() == window_threadid); // do not constrain aspect ratio for integer scaled views - if (m_target->current_view()->bounds().scale_type != RENDER_SCALE_FRACTIONAL) + if (m_target->scale_type() != RENDER_SCALE_FRACTIONAL) return rect; // get the pixel aspect ratio for the target monitor @@ -1787,7 +1787,7 @@ osd_dim win_window_info::get_min_bounds(int constrain) minheight += wnd_extra_height(); // if we want it constrained, figure out which one is larger - if (constrain && m_target->current_view()->bounds().scale_type == RENDER_SCALE_FRACTIONAL) + if (constrain && m_target->scale_type() == RENDER_SCALE_FRACTIONAL) { // first constrain with no height limit osd_rect test1(0,0,minwidth,10000); @@ -1847,7 +1847,7 @@ osd_dim win_window_info::get_max_bounds(int constrain) maximum = maximum.resize(tempw, temph); // constrain to fit - if (constrain && m_target->current_view()->bounds().scale_type == RENDER_SCALE_FRACTIONAL) + if (constrain && m_target->scale_type() == RENDER_SCALE_FRACTIONAL) maximum = constrain_to_aspect_ratio(maximum, WMSZ_BOTTOMRIGHT); return maximum.dim(); |