[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 134590] auto zoom settings (middle mouse button) are cleared
From:       Aurelien Gateau <aurelien.gateau () free ! fr>
Date:       2006-11-07 13:26:02
Message-ID: 20061107132602.32023.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
         
http://bugs.kde.org/show_bug.cgi?id=134590         
aurelien.gateau free fr changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From aurelien.gateau free fr  2006-11-07 14:26 -------
SVN commit 602991 by gateau:

Do not store auto-zoom values in mZoomBeforeAuto
BUG: 134590


 M  +10 -1     imageview.cpp  


--- trunk/extragear/graphics/gwenview/gvcore/imageview.cpp #602990:602991
 @ -450,6 +450,10  @
 	d->mGamma = 100;
 	d->mBrightness = 0;
 	d->mContrast = 100;
+	
+	if (!d->mLockZoom->isChecked()) {
+		d->mZoomBeforeAuto = 1.;
+	}
 }
 
 //------------------------------------------------------------------------
 @ -515,6 +519,7  @
 
 
 void ImageView::updateZoom(ZoomMode zoomMode, double value, int centerX, int centerY) {
+	ZoomMode oldZoomMode = d->mZoomMode;
 	double oldZoom=d->mZoom;
 	d->mZoomMode=zoomMode;
 	KAction* checkedZoomAction=0;
 @ -525,7 +530,11  @
 		Q_ASSERT(value!=0);
 		d->mZoom=value;
 	} else {
-		d->mZoomBeforeAuto=d->mZoom;
+		if (oldZoomMode == ZOOM_FREE) {
+			// Only store zoom before auto if we were in ZOOM_FREE mode, otherwise
+			// we will store the computed auto zoom value (Bug 134590)
+			d->mZoomBeforeAuto = d->mZoom;
+		}
 		d->mXCenterBeforeAuto=width()/2  + contentsX() + d->mXOffset;
 		d->mYCenterBeforeAuto=height()/2 + contentsY() + d->mYOffset;
[prev in list] [next in list] [prev in thread] [next in thread]