Merge pull request #292 from ProgrammingLife2017/canvas_to_develop

Canvas to develop

Author: YDutchy

src/main/java/programminglife/controller/MiniMapController.java

@@ -59,9 +59,6 @@ public void showPosition(int centerNode) {
         gc.clearRect(0, 0, miniMap.getWidth(), miniMap.getHeight());
         drawMiniMap();
         gc.setFill(Color.RED);
-        System.out.println(centerNode);
-        System.out.println(size);
-        System.out.println(miniMap.getWidth());
         gc.fillOval((centerNode / (double) size) * miniMap.getWidth(), 20, 10, 10);
     }
 }

src/main/java/programminglife/gui/controller/AutoCompleteTextField.java src/main/java/programminglife/gui/AutoCompleteTextField.java

@@ -1,10 +1,7 @@
-package programminglife.gui.controller;
+package programminglife.gui;
 
 import javafx.geometry.Side;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.CustomMenuItem;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontWeight;
@@ -89,18 +86,11 @@ private void populatePopup(List<String> searchResult, String searchRequest) {
         for (int i = 0; i < count; i++) {
             final String result = searchResult.get(i);
             //label with graphic (text flow) to highlight founded subtext in suggestions
-            Label entryLabel = new Label();
-            entryLabel.setGraphic(buildTextFlow(result, searchRequest));
-            entryLabel.setPrefHeight(10);  //don't sure why it's changed with "graphic"
-            CustomMenuItem item = new CustomMenuItem(entryLabel, true);
+            CheckBox checkBox = new CheckBox();
+            checkBox.setGraphic(buildTextFlow(result, searchRequest));
+            checkBox.setPrefHeight(10);  //don't sure why it's changed with "graphic"
+            CustomMenuItem item = new CustomMenuItem(checkBox, false);
             menuItems.add(item);
-
-            //if any suggestion is select set it into text and close popup
-            item.setOnAction(actionEvent -> {
-                setText(result);
-                positionCaret(result.length());
-                entriesPopup.hide();
-            });
         }
 
         //"Refresh" context menu

src/main/java/programminglife/gui/ResizableCanvas.java

@@ -0,0 +1,45 @@
+package programminglife.gui;
+
+import javafx.scene.canvas.Canvas;
+
+/**
+ * Class that extends Canvas to make it resizable.
+ */
+public class ResizableCanvas extends Canvas {
+
+    @Override
+    public double minHeight(double width) {
+        return 64;
+    }
+
+    @Override
+    public double maxHeight(double width) {
+        return 1000;
+    }
+
+    @Override
+    public double prefHeight(double width) {
+        return minHeight(width);
+    }
+
+    @Override
+    public double minWidth(double height) {
+        return 0;
+    }
+
+    @Override
+    public double maxWidth(double height) {
+        return 10000;
+    }
+
+    @Override
+    public boolean isResizable() {
+        return true;
+    }
+
+    @Override
+    public void resize(double width, double height) {
+        super.setWidth(width);
+        super.setHeight(height);
+    }
+}