diff --git a/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloApplication.java b/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloApplication.java index 649b3e6..a94a336 100644 --- a/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloApplication.java +++ b/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloApplication.java @@ -11,7 +11,7 @@ public class HelloApplication extends Application { @Override public void start(Stage stage) throws IOException { FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("hello-view.fxml")); - Scene scene = new Scene(fxmlLoader.load(), 320, 240); + Scene scene = new Scene(fxmlLoader.load(), 1280, 720); stage.setTitle("PixelWriter"); stage.setScene(scene); stage.show(); diff --git a/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloController.java b/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloController.java index f612cd1..c134554 100644 --- a/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloController.java +++ b/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloController.java @@ -50,7 +50,7 @@ public class HelloController implements Initializable { loadButton.setOnAction(this::onActionLoad); newCanvasButton.setOnAction(this::onActionCreateCanvas); scrollPane.setOnScroll(this::onScrollZoom); - scrollPane.getParent().setOnKeyPressed(this::onActionKeyPressed); + scrollPane.setOnKeyPressed(this::onActionKeyPressed); brushSizeLabel.textProperty().bind(brushSizeSlider.valueProperty().asString()); setupCanvas(); scrollPane.prefViewportHeightProperty().bind(pane.layoutYProperty()); diff --git a/graphical-app/src/main/java/fr/emiko/graphicalapp/NewCanvasController.java b/graphical-app/src/main/java/fr/emiko/graphicalapp/NewCanvasController.java index 98f71b5..5c78008 100644 --- a/graphical-app/src/main/java/fr/emiko/graphicalapp/NewCanvasController.java +++ b/graphical-app/src/main/java/fr/emiko/graphicalapp/NewCanvasController.java @@ -27,11 +27,11 @@ public class NewCanvasController implements Initializable { createButton.setOnAction(this::create); createButton.disableProperty().bind(validator.containsErrorsProperty()); cancelButton.setOnAction(this::close); - + widthTextField.setOnAction(this::create); validator.createCheck() .decorates(createButton) - .dependsOn("width", heightTextField.textProperty()) - .dependsOn("height", widthTextField.textProperty()) + .dependsOn("width", widthTextField.textProperty()) + .dependsOn("height", heightTextField.textProperty()) .withMethod(this::checkWidthHeight) .immediate(); } diff --git a/graphical-app/src/main/resources/fr/emiko/graphicalapp/hello-view.fxml b/graphical-app/src/main/resources/fr/emiko/graphicalapp/hello-view.fxml index 36ddda6..575f6e2 100644 --- a/graphical-app/src/main/resources/fr/emiko/graphicalapp/hello-view.fxml +++ b/graphical-app/src/main/resources/fr/emiko/graphicalapp/hello-view.fxml @@ -1,5 +1,6 @@ + @@ -70,28 +71,29 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - + + + +