mirror of
				https://github.com/arsenetar/dupeguru.git
				synced 2025-09-11 17:58:17 +00:00 
			
		
		
		
	Merge pull request #978 from glubsy/fix_zoom_scrollbar
Fix image viewer scrollbar zoom
This commit is contained in:
		
						commit
						efc99eee96
					
				@ -1041,26 +1041,44 @@ class ScrollAreaImageViewer(QScrollArea):
 | 
				
			|||||||
        """After scaling, no mouse position, default to center."""
 | 
					        """After scaling, no mouse position, default to center."""
 | 
				
			||||||
        # scrollBar.setMaximum(scrollBar.maximum() - scrollBar.minimum() + scrollBar.pageStep())
 | 
					        # scrollBar.setMaximum(scrollBar.maximum() - scrollBar.minimum() + scrollBar.pageStep())
 | 
				
			||||||
        self._horizontalScrollBar.setValue(
 | 
					        self._horizontalScrollBar.setValue(
 | 
				
			||||||
            int(factor * self._horizontalScrollBar.value() + ((factor - 1) * self._horizontalScrollBar.pageStep() / 2))
 | 
					            int(
 | 
				
			||||||
 | 
					                factor * self._horizontalScrollBar.value()
 | 
				
			||||||
 | 
					                + ((factor - 1) * self._horizontalScrollBar.pageStep() / 2)
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
        self._verticalScrollBar.setValue(
 | 
					        self._verticalScrollBar.setValue(
 | 
				
			||||||
            int(factor * self._verticalScrollBar.value() + ((factor - 1) * self._verticalScrollBar.pageStep() / 2))
 | 
					            int(
 | 
				
			||||||
 | 
					                factor * self._verticalScrollBar.value()
 | 
				
			||||||
 | 
					                + ((factor - 1) * self._verticalScrollBar.pageStep() / 2)
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def adjustScrollBarsScaled(self, delta):
 | 
					    def adjustScrollBarsScaled(self, delta):
 | 
				
			||||||
        """After scaling with the mouse, update relative to mouse position."""
 | 
					        """After scaling with the mouse, update relative to mouse position."""
 | 
				
			||||||
        self._horizontalScrollBar.setValue(self._horizontalScrollBar.value() + delta.x())
 | 
					        self._horizontalScrollBar.setValue(
 | 
				
			||||||
        self._verticalScrollBar.setValue(self._verticalScrollBar.value() + delta.y())
 | 
					            int(self._horizontalScrollBar.value() + delta.x())
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					        self._verticalScrollBar.setValue(
 | 
				
			||||||
 | 
					            int(self._verticalScrollBar.value() + delta.y())
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def adjustScrollBarsAuto(self):
 | 
					    def adjustScrollBarsAuto(self):
 | 
				
			||||||
        """After panning, update accordingly."""
 | 
					        """After panning, update accordingly."""
 | 
				
			||||||
        self.horizontalScrollBar().setValue(self.horizontalScrollBar().value() - self._mousePanningDelta.x())
 | 
					        self.horizontalScrollBar().setValue(
 | 
				
			||||||
        self.verticalScrollBar().setValue(self.verticalScrollBar().value() - self._mousePanningDelta.y())
 | 
					            int(self.horizontalScrollBar().value() - self._mousePanningDelta.x())
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					        self.verticalScrollBar().setValue(
 | 
				
			||||||
 | 
					            int(self.verticalScrollBar().value() - self._mousePanningDelta.y())
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def adjustScrollBarCentered(self):
 | 
					    def adjustScrollBarCentered(self):
 | 
				
			||||||
        """Just center in the middle."""
 | 
					        """Just center in the middle."""
 | 
				
			||||||
        self._horizontalScrollBar.setValue(int(self._horizontalScrollBar.maximum() / 2))
 | 
					        self._horizontalScrollBar.setValue(
 | 
				
			||||||
        self._verticalScrollBar.setValue(int(self._verticalScrollBar.maximum() / 2))
 | 
					            int(self._horizontalScrollBar.maximum() / 2)
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					        self._verticalScrollBar.setValue(
 | 
				
			||||||
 | 
					            int(self._verticalScrollBar.maximum() / 2)
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def resetCenter(self):
 | 
					    def resetCenter(self):
 | 
				
			||||||
        """Resets origin"""
 | 
					        """Resets origin"""
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user