Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-28 09:24:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Increase with of rows in market view offer book tables

Browse source
This commit is contained in:
Manfred Karrer 2016-03-20 15:38:45 +01:00
parent 30c827fe3c
commit 02485c03ee
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View file

@ -153,7 +153,7 @@ public class BitsquareApp extends Application {
mainView.setPersistedFilesCorrupted(corruptedDatabaseFiles); mainView.setPersistedFilesCorrupted(corruptedDatabaseFiles);
});*/ });*/
scene = new Scene(mainView.getRoot(), 1100, 740); scene = new Scene(mainView.getRoot(), 1150, 740);
scene.getStylesheets().setAll( scene.getStylesheets().setAll(
"/io/bitsquare/gui/bitsquare.css", "/io/bitsquare/gui/bitsquare.css",
"/io/bitsquare/gui/images.css"); "/io/bitsquare/gui/images.css");

16
gui/src/main/java/io/bitsquare/gui/main/markets/charts/MarketsChartsView.java
View file

@ -166,14 +166,14 @@ public class MarketsChartsView extends ActivatableViewAndModel<VBox, MarketsChar
TableView<Offer> tableView = new TableView<>(); TableView<Offer> tableView = new TableView<>();
tableView.setMinHeight(100); tableView.setMinHeight(100);
tableView.setMaxHeight(100); tableView.setMaxHeight(100);
tableView.setMinWidth(490); tableView.setMinWidth(530);
tableView.setMouseTransparent(true); tableView.setMouseTransparent(true);
// price // price
TableColumn<Offer, Offer> priceColumn = new TableColumn<>(); TableColumn<Offer, Offer> priceColumn = new TableColumn<>();
priceColumn.textProperty().bind(priceColumnLabel); priceColumn.textProperty().bind(priceColumnLabel);
priceColumn.setMinWidth(120); priceColumn.setMinWidth(130);
priceColumn.setMaxWidth(120); priceColumn.setMaxWidth(130);
priceColumn.setSortable(false); priceColumn.setSortable(false);
priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
priceColumn.setCellFactory( priceColumn.setCellFactory(
@ -197,8 +197,8 @@ public class MarketsChartsView extends ActivatableViewAndModel<VBox, MarketsChar
// amount // amount
TableColumn<Offer, Offer> amountColumn = new TableColumn<>("Amount (BTC)"); TableColumn<Offer, Offer> amountColumn = new TableColumn<>("Amount (BTC)");
amountColumn.setText("Amount (BTC)"); amountColumn.setText("Amount (BTC)");
amountColumn.setMinWidth(120); amountColumn.setMinWidth(130);
amountColumn.setMaxWidth(120); amountColumn.setMaxWidth(130);
amountColumn.setSortable(false); amountColumn.setSortable(false);
amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
amountColumn.setCellFactory( amountColumn.setCellFactory(
@ -221,8 +221,8 @@ public class MarketsChartsView extends ActivatableViewAndModel<VBox, MarketsChar
// volume // volume
TableColumn<Offer, Offer> volumeColumn = new TableColumn<>(); TableColumn<Offer, Offer> volumeColumn = new TableColumn<>();
volumeColumn.setMinWidth(120); volumeColumn.setMinWidth(130);
volumeColumn.setMaxWidth(120); volumeColumn.setMaxWidth(130);
volumeColumn.setSortable(false); volumeColumn.setSortable(false);
volumeColumn.textProperty().bind(volumeColumnLabel); volumeColumn.textProperty().bind(volumeColumnLabel);
volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
@ -246,7 +246,7 @@ public class MarketsChartsView extends ActivatableViewAndModel<VBox, MarketsChar
// payment method // payment method
TableColumn<Offer, Offer> paymentMethodColumn = new TableColumn<>("Payment method"); TableColumn<Offer, Offer> paymentMethodColumn = new TableColumn<>("Payment method");
paymentMethodColumn.setMinWidth(120); paymentMethodColumn.setMinWidth(130);
paymentMethodColumn.setSortable(false); paymentMethodColumn.setSortable(false);
paymentMethodColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); paymentMethodColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
paymentMethodColumn.setCellFactory( paymentMethodColumn.setCellFactory(

3
gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java
View file

@ -33,7 +33,6 @@ import javafx.collections.ObservableList;
import javafx.geometry.HPos; import javafx.geometry.HPos;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.geometry.Orientation; import javafx.geometry.Orientation;
import javafx.scene.Camera;
import javafx.scene.PerspectiveCamera; import javafx.scene.PerspectiveCamera;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.*; import javafx.scene.control.*;
@ -506,9 +505,7 @@ public abstract class Overlay<T extends Overlay> {
)); ));
} else if (type.animationType == AnimationType.ScaleYFromCenter) { } else if (type.animationType == AnimationType.ScaleYFromCenter) {
gridPane.setRotationAxis(Rotate.X_AXIS); gridPane.setRotationAxis(Rotate.X_AXIS);
Camera camera = gridPane.getScene().getCamera();
gridPane.getScene().setCamera(new PerspectiveCamera()); gridPane.getScene().setCamera(new PerspectiveCamera());
keyFrames.add(new KeyFrame(Duration.millis(0), keyFrames.add(new KeyFrame(Duration.millis(0),
new KeyValue(gridPane.rotateProperty(), 0, interpolator), new KeyValue(gridPane.rotateProperty(), 0, interpolator),
new KeyValue(gridPane.opacityProperty(), 1, interpolator) new KeyValue(gridPane.opacityProperty(), 1, interpolator)

1
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
View file

@ -45,6 +45,7 @@ public class TacWindow extends Overlay<TacWindow> {
closeButtonText("I disagree and quit"); closeButtonText("I disagree and quit");
onAction(() -> preferences.setTacAccepted(true)); onAction(() -> preferences.setTacAccepted(true));
onClose(BitsquareApp.shutDownHandler::run); onClose(BitsquareApp.shutDownHandler::run);
super.show(); super.show();
} }
} }