- //setMaximumSize(m_frame.width(), m_frame.height()); //This is a hack to force Qt to center the view in the scroll area
- //setMinimumSize(m_frame.width(), m_frame.height());
- resize(m_frame.width(), m_frame.height());
- }
+ double magnification;
+ if(level == 100) {
+ magnification = 2.0;
+ } else if(level >= 90) {
+ magnification = 1.0;
+ } else {
+ const double min_horiz_magnification = double(parentWidget()->width())/m_frame.width();
+ const double min_vert_magnification = double(parentWidget()->height())/m_frame.height();
+ const double fit_screen_magnification = qMin(min_horiz_magnification, min_vert_magnification);
+
+ //level=90 => magnification=1.0, level=0 => magnification=fit_screen_magnification
+ magnification = (level)/90.0*(1.0 - fit_screen_magnification) + fit_screen_magnification;
+ }
+
+ if(magnification < 0 //remote display smaller than local?
+ or magnification != magnification) //nan
+ magnification = 1.0;
+
+ m_verticalFactor = m_horizontalFactor = magnification;
+ resize(m_frame.width()*magnification, m_frame.height()*magnification);