Skip to content

Commit

Permalink
Increase with of rows in market view offer book tables
Browse files Browse the repository at this point in the history
  • Loading branch information
ManfredKarrer committed Mar 20, 2016
1 parent 30c827f commit 02485c0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gui/src/main/java/io/bitsquare/app/BitsquareApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void start(Stage primaryStage) throws IOException {
mainView.setPersistedFilesCorrupted(corruptedDatabaseFiles);
});*/

scene = new Scene(mainView.getRoot(), 1100, 740);
scene = new Scene(mainView.getRoot(), 1150, 740);
scene.getStylesheets().setAll(
"/io/bitsquare/gui/bitsquare.css",
"/io/bitsquare/gui/images.css");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,14 @@ private Tuple3<TableView<Offer>, VBox, Button> getOfferTable(Offer.Direction dir
TableView<Offer> tableView = new TableView<>();
tableView.setMinHeight(100);
tableView.setMaxHeight(100);
tableView.setMinWidth(490);
tableView.setMinWidth(530);
tableView.setMouseTransparent(true);

// price
TableColumn<Offer, Offer> priceColumn = new TableColumn<>();
priceColumn.textProperty().bind(priceColumnLabel);
priceColumn.setMinWidth(120);
priceColumn.setMaxWidth(120);
priceColumn.setMinWidth(130);
priceColumn.setMaxWidth(130);
priceColumn.setSortable(false);
priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
priceColumn.setCellFactory(
Expand All @@ -197,8 +197,8 @@ public void updateItem(final Offer offer, boolean empty) {
// amount
TableColumn<Offer, Offer> amountColumn = new TableColumn<>("Amount (BTC)");
amountColumn.setText("Amount (BTC)");
amountColumn.setMinWidth(120);
amountColumn.setMaxWidth(120);
amountColumn.setMinWidth(130);
amountColumn.setMaxWidth(130);
amountColumn.setSortable(false);
amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
amountColumn.setCellFactory(
Expand All @@ -221,8 +221,8 @@ public void updateItem(final Offer offer, boolean empty) {

// volume
TableColumn<Offer, Offer> volumeColumn = new TableColumn<>();
volumeColumn.setMinWidth(120);
volumeColumn.setMaxWidth(120);
volumeColumn.setMinWidth(130);
volumeColumn.setMaxWidth(130);
volumeColumn.setSortable(false);
volumeColumn.textProperty().bind(volumeColumnLabel);
volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
Expand All @@ -246,7 +246,7 @@ public void updateItem(final Offer offer, boolean empty) {

// payment method
TableColumn<Offer, Offer> paymentMethodColumn = new TableColumn<>("Payment method");
paymentMethodColumn.setMinWidth(120);
paymentMethodColumn.setMinWidth(130);
paymentMethodColumn.setSortable(false);
paymentMethodColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
paymentMethodColumn.setCellFactory(
Expand Down
3 changes: 0 additions & 3 deletions gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import javafx.geometry.HPos;
import javafx.geometry.Insets;
import javafx.geometry.Orientation;
import javafx.scene.Camera;
import javafx.scene.PerspectiveCamera;
import javafx.scene.Scene;
import javafx.scene.control.*;
Expand Down Expand Up @@ -506,9 +505,7 @@ protected void animateHide(Runnable onFinishedHandler) {
));
} else if (type.animationType == AnimationType.ScaleYFromCenter) {
gridPane.setRotationAxis(Rotate.X_AXIS);
Camera camera = gridPane.getScene().getCamera();
gridPane.getScene().setCamera(new PerspectiveCamera());

keyFrames.add(new KeyFrame(Duration.millis(0),
new KeyValue(gridPane.rotateProperty(), 0, interpolator),
new KeyValue(gridPane.opacityProperty(), 1, interpolator)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public void showIfNeeded() {
closeButtonText("I disagree and quit");
onAction(() -> preferences.setTacAccepted(true));
onClose(BitsquareApp.shutDownHandler::run);

super.show();
}
}
Expand Down

0 comments on commit 02485c0

Please sign in to comment.