From 0e4be67ee9d55d364a0d74efdc68a54b059dca1a Mon Sep 17 00:00:00 2001
From: shun_iwasawa <shun_iwasawa@dwango.co.jp>
Date: May 18 2017 07:23:32 +0000
Subject: fix flipbook auto-resize


---

diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp
index 1b4d348..a46085f 100644
--- a/toonz/sources/toonz/flipbook.cpp
+++ b/toonz/sources/toonz/flipbook.cpp
@@ -2078,7 +2078,9 @@ void FlipBook::onDoubleClick(QMouseEvent *me) {
   if (!img) return;
 
   TAffine toWidgetRef(m_imageViewer->getImgToWidgetAffine());
-  TRectD pixGeomD(toWidgetRef * getImageBoundsD(img));
+  TRectD pixGeomD(TScale(1.0 / (double)m_imageViewer->getDevPixRatio()) *
+                  toWidgetRef * getImageBoundsD(img));
+  // TRectD pixGeomD(toWidgetRef  * getImageBoundsD(img));
   TRect pixGeom(tceil(pixGeomD.x0), tceil(pixGeomD.y0), tfloor(pixGeomD.x1) - 1,
                 tfloor(pixGeomD.y1) - 1);
 
diff --git a/toonz/sources/toonz/imageviewer.cpp b/toonz/sources/toonz/imageviewer.cpp
index 4abfd87..5edb2b4 100644
--- a/toonz/sources/toonz/imageviewer.cpp
+++ b/toonz/sources/toonz/imageviewer.cpp
@@ -1098,7 +1098,8 @@ TAffine ImageViewer::getImgToWidgetAffine() const {
 TAffine ImageViewer::getImgToWidgetAffine(const TRectD &geom) const {
   TPointD geomCenter((geom.x0 + geom.x1) * 0.5, (geom.y0 + geom.y1) * 0.5);
 
-  QRect widGeom(geometry());
+  QRect widGeom(rect());
+
   TPointD viewerCenter((widGeom.left() + widGeom.right() + 1) * 0.5,
                        (widGeom.top() + widGeom.bottom() + 1) * 0.5);
 
@@ -1112,7 +1113,7 @@ TAffine ImageViewer::getImgToWidgetAffine(const TRectD &geom) const {
 //! Adapts image viewer's affine to display the passed image rect at maximized
 //! ratio
 void ImageViewer::adaptView(const TRect &imgRect, const TRect &viewRect) {
-  QRect viewerRect(geometry());
+  QRect viewerRect(rect());
 
   double imageScale = std::min(viewerRect.width() / (double)viewRect.getLx(),
                                viewerRect.height() / (double)viewRect.getLy());