comparison panner.cpp @ 113:5fc7b4fc77a8

* Better error handling/reporting; some futile changes to termios handling; avoid weirdly stretching panned view in panner

     COPYING included with this distribution for more information.
 */
 
 #include "panner.h"
 #include "panned.h"
+#include "debug.h"
 
 #include <QPolygon>
 #include <QMouseEvent>
 #include <QColor>
 

     setMouseTracking(true);
     setInteractive(false);
 }
 
 void
+Panner::fit(QRectF r)
+{
+    Qt::AspectRatioMode m = Qt::IgnoreAspectRatio;
+    if (height() > width()) {
+        // Our panner is vertical; if the source is not tall,
+        // don't stretch it to fit in the height, it'd look weird
+        if (r.height() < height() * 2) {
+            m = Qt::KeepAspectRatio;
+        }
+    } else {
+        // Similarly, but horizontal
+        if (r.width() < width() * 2) {
+            m = Qt::KeepAspectRatio;
+        }
+    }
+    DEBUG << "Panner: fit mode " << m << endl;
+    fitInView(r, m);
+}
+
+void
 Panner::setScene(QGraphicsScene *s)
 {
     if (scene()) {
         disconnect(scene(), SIGNAL(sceneRectChanged(const QRectF &)),
                    this, SLOT(slotSceneRectChanged(const QRectF &)));
     }
     QGraphicsView::setScene(s);
-    if (scene()) fitInView(sceneRect(), Qt::IgnoreAspectRatio);
+    if (scene()) {
+        QRectF r = sceneRect();
+        DEBUG << "scene rect: " << r << ", my rect " << rect() << endl;
+        fit(r);
+    }
     m_cache = QPixmap();
     connect(scene(), SIGNAL(sceneRectChanged(const QRectF &)),
             this, SLOT(slotSceneRectChanged(const QRectF &)));
 }
 

 }
 
 void
 Panner::resizeEvent(QResizeEvent *)
 {
-    if (scene()) fitInView(sceneRect(), Qt::IgnoreAspectRatio);
+    if (scene()) fit(sceneRect());
     m_cache = QPixmap();
 }
 
 void
 Panner::slotSceneRectChanged(const QRectF &newRect)
 {
     if (!scene()) return; // spurious
-    fitInView(newRect, Qt::IgnoreAspectRatio);
+    fit(newRect);
     m_cache = QPixmap();
     viewport()->update();
 }
 
 void

                   QGraphicsItem *items[],
                   const QStyleOptionGraphicsItem options[])
 {
     if (m_cache.size() != viewport()->size()) {
 
-    std::cerr << "Panner: recreating cache" << std::endl;
+        DEBUG << "Panner: recreating cache" << endl;
 
         QGraphicsScene *s = scene();
         if (!s) return;
         PannerScene *ps = static_cast<PannerScene *>(s);