From 12f01a7a8cc82955b059e1fd070c1e4f76e00c4d Mon Sep 17 00:00:00 2001
From: przemo8155 <przemo8155@wp.pl>
Date: Sun, 14 Jan 2018 12:25:10 +0100
Subject: [PATCH] Usuniecie bugow

---
 src/application/MainWindowController.java | 69 ++++++++++++-----------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java
index 31d47857..ef327612 100644
--- a/src/application/MainWindowController.java
+++ b/src/application/MainWindowController.java
@@ -146,6 +146,7 @@ public class MainWindowController
 	double orgTranslateX, orgTranslateY;
 	static int minusWidth = 95;
 	protected int startingFaze = 0;
+	final double SCALE_DELTA = 1.1;
 
 	public static String optPath = "";
 	public static String checkFileRecognition = "";
@@ -3189,7 +3190,6 @@ void mainPane_OnMouseDragged(MouseEvent event)
 		{
 			case "move":
 				hideInformationTooltip();
-				movingMainPane();
 				int _it = 0;
 				while (_it < utilities.takeMaximumFromLists(circleList, rectangleList, headArrowList,
 						leftDoubleArrowList, rightDoubleArrowList, existingImageViews, tokensBiggerThanTen, tags,
@@ -3245,43 +3245,13 @@ public void initialize()
 		mainWindowControllerReadSetting();
 		setPaneResolution();
 
-		mainPane.setFocusTraversable(true);
 		setBackgroundColor();
 		setTooltips();
 		initializeStats();
 
-		movingMainPane();
-
-
-
-
 
 
 
-
-		mainPane.setOnScroll(new EventHandler<ScrollEvent>()
-		{
-
-			@Override
-			public void handle(ScrollEvent event)
-			{
-				double zoomFactor = 1.02;
-                double deltaY = event.getDeltaY();
-
-                if (deltaY < 0){
-                    zoomFactor = 0.98;
-                }
-                mainPane.setScaleX(mainPane.getScaleX() * zoomFactor);
-                mainPane.setScaleY(mainPane.getScaleY() * zoomFactor);
-
-
-
-                event.consume();
-
-			}
-
-		});
-
 		middleLabel.setDisable(true);
 
 		mainPane_AddEventHandlerClick();
@@ -4483,16 +4453,16 @@ private void setTooltips()
 
 	void setPaneResolution()
 	{
-		/*Rectangle2D primaryScreenBounds = Screen.getPrimary().getVisualBounds();
+		Rectangle2D primaryScreenBounds = Screen.getPrimary().getVisualBounds();
 		mainPane.setMaxWidth(primaryScreenBounds.getWidth());
 		mainPane.setMaxHeight(primaryScreenBounds.getHeight());
 		mainPane.setMinWidth(primaryScreenBounds.getWidth());
 		mainPane.setMinHeight(primaryScreenBounds.getHeight());
-*/
+/*
 		mainPane.setMaxWidth(PANE_WIDTH);
 		mainPane.setMaxHeight(PANE_HEIGHT);
 		mainPane.setMinWidth(PANE_WIDTH);
-		mainPane.setMinHeight(PANE_HEIGHT);
+		mainPane.setMinHeight(PANE_HEIGHT);*/
 
 	}
 
@@ -5674,6 +5644,37 @@ void startAnimationButton_OnMouseClicked(MouseEvent event)
 		hideInformationTooltip();
 	}
 
+	void zoomingMainPane()
+	{
+
+
+
+		mainPane.setOnScroll(new EventHandler<ScrollEvent>()
+		{
+
+			@Override
+			public void handle(ScrollEvent event)
+			{
+				 event.consume();
+
+				    if (event.getDeltaY() == 0) {
+				      return;
+				    }
+
+				    double scaleFactor =
+				      (event.getDeltaY() > 0)
+				        ? SCALE_DELTA
+				        : 1/SCALE_DELTA;
+
+				    mainPane.setScaleX(mainPane.getScaleX() * scaleFactor);
+				    mainPane.setScaleY(mainPane.getScaleY() * scaleFactor);
+
+
+			}
+
+		});
+	}
+
 	void movingMainPane()
 	{
 		mainPane.setFocusTraversable(true);