1.1 --- a/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXBrwsr.java	Wed Jul 15 22:06:19 2015 +0200
     1.2 +++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXBrwsr.java	Sun Jul 19 13:09:06 2015 +0200
     1.3 @@ -128,21 +128,21 @@
     1.4              return INSTANCE.newView(url, onLoad);
     1.5          }
     1.6      }
     1.7 -    
     1.8 +
     1.9      static synchronized Stage findStage() throws InterruptedException {
    1.10          while (INSTANCE == null) {
    1.11              FXBrwsr.class.wait();
    1.12          }
    1.13          return INSTANCE.stage;
    1.14      }
    1.15 -    
    1.16 +
    1.17      private Stage stage;
    1.18  
    1.19      @Override
    1.20      public void start(Stage primaryStage) throws Exception {
    1.21          BorderPane r = new BorderPane();
    1.22 -        Rectangle2D screen = Screen.getPrimary().getBounds();
    1.23 -        Scene scene = new Scene(r, screen.getWidth() * 0.9, screen.getHeight() * 0.9);
    1.24 +        Rectangle2D rect = findInitialSize();
    1.25 +        Scene scene = new Scene(r, rect.getWidth(), rect.getHeight());
    1.26          primaryStage.setScene(scene);
    1.27          this.root = r;
    1.28          this.stage = primaryStage;
    1.29 @@ -150,11 +150,21 @@
    1.30              INSTANCE = this;
    1.31              FXBrwsr.class.notifyAll();
    1.32          }
    1.33 -        primaryStage.setX(scene.getWidth() * 0.05);
    1.34 -        primaryStage.setY(scene.getHeight()* 0.05);
    1.35 +        primaryStage.setX(rect.getMinX());
    1.36 +        primaryStage.setY(rect.getMinY());
    1.37          primaryStage.show();
    1.38      }
    1.39  
    1.40 +    static Rectangle2D findInitialSize() {
    1.41 +        Rectangle2D screen = Screen.getPrimary().getBounds();
    1.42 +        return new Rectangle2D(
    1.43 +            screen.getWidth() * 0.05,
    1.44 +            screen.getHeight() * 0.05,
    1.45 +            screen.getWidth() * 0.9,
    1.46 +            screen.getHeight() * 0.9
    1.47 +        );
    1.48 +    }
    1.49 +
    1.50      private WebView newView(final URL url, final FXPresenter onLoad) {
    1.51          final WebView view = new WebView();
    1.52          view.setContextMenuEnabled(false);
    1.53 @@ -203,7 +213,7 @@
    1.54                  box.getChildren().addAll(text, buttons);
    1.55                  dialogStage.setScene(new Scene(box));
    1.56                  ok.setCancelButton(false);
    1.57 -                
    1.58 +
    1.59                  final boolean[] res = new boolean[1];
    1.60                  ok.setOnAction(new CloseDialogHandler(dialogStage, res));
    1.61                  cancel.setCancelButton(true);
    1.62 @@ -240,7 +250,7 @@
    1.63                  box.getChildren().addAll(text, line, buttons);
    1.64                  dialogStage.setScene(new Scene(box));
    1.65                  ok.setCancelButton(false);
    1.66 -                
    1.67 +
    1.68                  final boolean[] res = new boolean[1];
    1.69                  ok.setOnAction(new CloseDialogHandler(dialogStage, res));
    1.70                  cancel.setCancelButton(true);
    1.71 @@ -254,7 +264,7 @@
    1.72          final Worker<Void> w = view.getEngine().getLoadWorker();
    1.73          w.stateProperty().addListener(new ChangeListener<Worker.State>() {
    1.74              private String previous;
    1.75 -            
    1.76 +
    1.77              @Override
    1.78              public void changed(ObservableValue<? extends Worker.State> ov, Worker.State t, Worker.State newState) {
    1.79                  if (newState.equals(Worker.State.SUCCEEDED)) {
    1.80 @@ -276,7 +286,7 @@
    1.81                  previous = crnt;
    1.82                  return true;
    1.83              }
    1.84 -            
    1.85 +
    1.86          });
    1.87          class Title implements ChangeListener<String> {
    1.88  
    1.89 @@ -310,7 +320,7 @@
    1.90              }
    1.91          }
    1.92      }
    1.93 -    
    1.94 +
    1.95      private static final class CloseDialogHandler implements EventHandler<ActionEvent> {
    1.96          private final Stage dialogStage;
    1.97          private final boolean[] res;
    1.98 @@ -328,5 +338,5 @@
    1.99              }
   1.100          }
   1.101      }
   1.102 -    
   1.103 +
   1.104  }