v20.11.09.0 fixed positioning

Grigory-Rylov · Nov 9, 2020 · e552f91 · e552f91
1 parent d3102e3
commit e552f91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'com.github.grishberg'
-version '20.11.08.1'
+version '20.11.09.0'
 def use_jdk8 = project.hasProperty("use_jdk8")
 
 if (use_jdk8) {

diff --git a/src/main/java/com/github/grishberg/profiler/ui/ZoomAndPanDelegate.java b/src/main/java/com/github/grishberg/profiler/ui/ZoomAndPanDelegate.java
@@ -2,15 +2,8 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.awt.Component;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
+import java.awt.*;
+import java.awt.event.*;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.Point2D;
@@ -103,7 +96,6 @@ public void mouseReleased(MouseEvent e) {
         targetComponent.repaint();
     }
 
-
     private boolean isCtrlShiftPressed(MouseEvent e) {
         return isShiftPressed(e) && isCtrlPressed(e);
     }
@@ -222,7 +214,7 @@ public Rectangle2D.Double transformRectangle(Rectangle2D rectSrc) throws Noninve
         Point2D.Double rightBottom = new Point2D.Double();
         inverse.transform(new Point2D.Double(rectSrc.getX(), rectSrc.getY()), leftTop);
         inverse.transform(new Point2D.Double(rectSrc.getMaxX(), rectSrc.getMaxY()), rightBottom);
-        return new Rectangle2D.Double(leftTop.x, leftTop.y, rightBottom.x, rightBottom.y);
+        return new Rectangle2D.Double(leftTop.x, leftTop.y, rightBottom.x - leftTop.x, rightBottom.y - leftTop.y);
     }
 
     public Point2D.Float transformPoint(Point2D.Double p1) throws NoninvertibleTransformException {
@@ -380,7 +372,7 @@ public Point2D correctOffset(double dx, double dy, Rectangle2D transformedScreen
         @Override
         public double calculateNavigationDy(Rectangle2D transformedScreen, Rectangle2D targetElement) {
             Point.Double targetElementCenter = new Point.Double(targetElement.getCenterX(), targetElement.getCenterY());
-            return transformedScreen.getCenterY() - targetElementCenter.getY();
+            return ((transformedScreen.getMinY() + transformedScreen.getMaxY()) / 2) - targetElementCenter.getY();
         }
     }