diff --git a/client/src/main/java/ru/trader/Main.java b/client/src/main/java/ru/trader/Main.java
index 6713938..c525819 100644
--- a/client/src/main/java/ru/trader/Main.java
+++ b/client/src/main/java/ru/trader/Main.java
@@ -24,6 +24,7 @@ public class Main extends Application {
@Override
public void start(Stage primaryStage) throws Exception {
primaryStage.setTitle("Trader");
+ primaryStage.setMinHeight(590);
primaryStage.setScene(new Scene(Screeners.newScreeners(Main.class.getResource("/view/main.fxml"),getUrl("style.css").toExternalForm())));
primaryStage.setOnCloseRequest((we)->{
try {
diff --git a/client/src/main/java/ru/trader/controllers/ItemDescController.java b/client/src/main/java/ru/trader/controllers/ItemDescController.java
index c705d67..12b6d9c 100644
--- a/client/src/main/java/ru/trader/controllers/ItemDescController.java
+++ b/client/src/main/java/ru/trader/controllers/ItemDescController.java
@@ -25,6 +25,7 @@ public class ItemDescController {
public void setItemDesc(ItemDescModel itemDesc){
item = itemDesc;
+ if (popup!=null) popup.setDetachedTitle(item.nameProperty().get());
fill();
}
@@ -39,7 +40,7 @@ public class ItemDescController {
if (popup != null && popup.isShowing()) return;
if (popup == null) {
popup = new PopOver(itemDescScreen);
- popup.detach();
+ popup.setDetachedTitle(item.nameProperty().get());
popup.setAutoHide(true);
}
diff --git a/client/src/main/java/ru/trader/controllers/OffersController.java b/client/src/main/java/ru/trader/controllers/OffersController.java
index 305e0cb..542ab1d 100644
--- a/client/src/main/java/ru/trader/controllers/OffersController.java
+++ b/client/src/main/java/ru/trader/controllers/OffersController.java
@@ -2,6 +2,7 @@ package ru.trader.controllers;
import javafx.collections.FXCollections;
import javafx.scene.control.ListView;
+import javafx.scene.input.MouseButton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javafx.fxml.FXML;
@@ -40,6 +41,23 @@ public class OffersController {
vendors.getSelectionModel().select(oldValue);
}
});
+ tblSell.getSelectionModel().selectedItemProperty().addListener((v, o, n) -> {
+ if (n!=null) Screeners.changeItemDesc(n);
+ });
+ tblBuy.getSelectionModel().selectedItemProperty().addListener((v, o, n) -> {
+ if (n!=null) Screeners.changeItemDesc(n);
+ });
+ tblSell.setOnMouseClicked((e) -> {
+ if (e.getButton() == MouseButton.SECONDARY){
+ Screeners.showItemDesc(tblSell);
+ }
+ });
+ tblBuy.setOnMouseClicked((e) -> {
+ if (e.getButton() == MouseButton.SECONDARY){
+ Screeners.showItemDesc(tblBuy);
+ }
+ });
+
init();
}
diff --git a/client/src/main/resources/view/itemDesc.fxml b/client/src/main/resources/view/itemDesc.fxml
index d5550ee..82e42f3 100644
--- a/client/src/main/resources/view/itemDesc.fxml
+++ b/client/src/main/resources/view/itemDesc.fxml
@@ -4,13 +4,17 @@
+
-
+ fx:controller="ru.trader.controllers.ItemDescController"
+ spacing="4" >
+
+
+
-
+
diff --git a/client/src/main/resources/view/offers.fxml b/client/src/main/resources/view/offers.fxml
index 8164eee..c2719a0 100644
--- a/client/src/main/resources/view/offers.fxml
+++ b/client/src/main/resources/view/offers.fxml
@@ -20,7 +20,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/client/src/main/resources/view/routers.fxml b/client/src/main/resources/view/routers.fxml
index 20be276..f5f9e2c 100644
--- a/client/src/main/resources/view/routers.fxml
+++ b/client/src/main/resources/view/routers.fxml
@@ -56,10 +56,10 @@
-
+
-
+
diff --git a/client/src/main/resources/view/style.css b/client/src/main/resources/view/style.css
index 38457a6..c2c0088 100644
--- a/client/src/main/resources/view/style.css
+++ b/client/src/main/resources/view/style.css
@@ -14,6 +14,13 @@
-fx-background-radius: 0, 0;
}
+.list-view:focused {
+ -fx-background-color: -fx-box-border, -fx-control-inner-background;
+ -fx-background-insets: 0,1;
+ -fx-background-radius: 0, 0;
+}
+
+
HBox.fields-group {
-fx-spacing: 2;
-fx-padding: 5 10;
diff --git a/core/src/main/java/ru/trader/core/MarketSupport.java b/core/src/main/java/ru/trader/core/MarketSupport.java
index 9488551..a73584b 100644
--- a/core/src/main/java/ru/trader/core/MarketSupport.java
+++ b/core/src/main/java/ru/trader/core/MarketSupport.java
@@ -154,25 +154,25 @@ public abstract class MarketSupport implements Market {
LOG.debug("Get top {}", limit);
TreeSet top = new TreeSet<>();
for (Vendor vendor : getVendors()) {
- LOG.debug("Check vendor {}", vendor);
+ LOG.trace("Check vendor {}", vendor);
for (Offer sell : vendor.getAllSellOffers()) {
long count = Math.min(max, (long) Math.floor(balance / sell.getPrice()));
- LOG.debug("Sell offer {}, count = {}", sell, count);
+ LOG.trace("Sell offer {}, count = {}", sell, count);
if (count == 0) continue;
Iterator buyers = getStatBuy(sell.getItem()).getOffers().descendingIterator();
while (buyers.hasNext()){
Offer buy = buyers.next();
Order order = new Order(sell, buy, count);
- LOG.debug("Buy offer {} profit = {}", buy, order.getProfit());
+ LOG.trace("Buy offer {} profit = {}", buy, order.getProfit());
if (order.getProfit() <= 0 ) break;
if (top.size() == limit){
- LOG.debug("Min order {}", top.first());
+ LOG.trace("Min order {}", top.first());
if (top.first().getProfit() < order.getProfit()) {
LOG.debug("Add to top");
top.add(order);
top.pollFirst();
} else {
- LOG.debug("Is low profit, skip");
+ LOG.trace("Is low profit, skip");
break;
}
} else {