Merge branch 'master' of https://git.shs.tools/SHS/qad

libs/widgets/image_view.cpp

@@ -24,7 +24,7 @@ ImageView::ImageView(QWidget * parent): QGraphicsView(parent), item(new QGraphic
 	scene()->addItem(item);
 	viewport()->setAutoFillBackground(false);
 	viewport()->installEventFilter(this);
-	autofit_     = true;
+	autofit_ = smooth_big = true;
 	interactive_          = false;
 }
 
@@ -87,6 +87,12 @@ void ImageView::clear() {
 }
 
 
+void ImageView::setSmoothBigImages(bool yes) {
+	smooth_big = yes;
+	adjustView();
+}
+
+
 void ImageView::mouseDoubleClickEvent(QMouseEvent *) {
 	autofit();
 }
@@ -133,12 +139,13 @@ bool ImageView::eventFilter(QObject * o, QEvent * e) {
 
 
 void ImageView::adjustView() {
+	item->setScale(1.);
+	if (smooth_big) {
 		QSize ws = size();
 #if QT_VERSION_MAJOR >= 5
 		ws *= devicePixelRatio();
 #endif
 		int nw = map.size().boundedTo(ws).width();
-	item->setScale(1.);
 		if (nw > 0) {
 			qreal mp = map.width() / nw;
 			if (mp > 1.) {
@@ -149,6 +156,8 @@ void ImageView::adjustView() {
 				item->setPixmap(map);
 		} else
 			item->setPixmap(map);
+	} else
+		item->setPixmap(map);
 	if (!autofit_) return;
 	QRectF r = item->mapRectToScene(item->boundingRect());
 	setSceneRect(r);

libs/widgets/image_view.h

@@ -32,6 +32,7 @@ class QAD_WIDGETS_EXPORT ImageView: public QGraphicsView {
 	Q_OBJECT
 	Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
 	Q_PROPERTY(bool viewInteractive READ viewInteractive WRITE setViewInteractive)
+	Q_PROPERTY(bool smoothBigImages READ isSmoothBigImages WRITE setSmoothBigImages)
 
 public:
 	ImageView(QWidget * parent = nullptr);
@@ -44,6 +45,9 @@ public:
 	bool viewInteractive() const { return interactive_; }
 	void clear();
 
+	bool isSmoothBigImages() const { return smooth_big; }
+	void setSmoothBigImages(bool yes);
+
 public slots:
 	void autofit();
 	void setPixmap(QPixmap pixmap);
@@ -62,7 +66,7 @@ private:
 	QGraphicsPixmapItem * item;
 	QByteArray im_data;
 	QPoint prev_pos;
-	bool autofit_, interactive_;
+	bool autofit_, interactive_, smooth_big;
 	QPixmap map;
 };