From 8d995b057e599cbbdb626f8c7041f912581a7480 Mon Sep 17 00:00:00 2001 From: Simon Forsberg Date: Mon, 1 Jun 2015 15:49:45 +0200 Subject: [PATCH] added flavor text to JavaFX as a tooltip over the card name, addressing #151 --- .../client/views/CardBattlefieldDocumentController.java | 3 +++ .../cardshifter/client/views/CardHandDocumentController.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardBattlefieldDocumentController.java b/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardBattlefieldDocumentController.java index f2955843..3cfe31a2 100644 --- a/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardBattlefieldDocumentController.java +++ b/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardBattlefieldDocumentController.java @@ -16,6 +16,7 @@ import javafx.fxml.Initializable; import javafx.scene.control.Button; import javafx.scene.control.Label; +import javafx.scene.control.Tooltip; import javafx.scene.input.MouseEvent; import javafx.scene.layout.AnchorPane; import javafx.scene.paint.Color; @@ -104,6 +105,8 @@ private void setCardLabels() { case "SCRAP": scrapValue.setText(String.format("Scrap = %s", stringValue)); break; + case "flavor": + nameText.setTooltip(new Tooltip(stringValue)); default: break; } diff --git a/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardHandDocumentController.java b/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardHandDocumentController.java index 7678e339..c4c4dc17 100644 --- a/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardHandDocumentController.java +++ b/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardHandDocumentController.java @@ -5,6 +5,7 @@ import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.control.Label; +import javafx.scene.control.Tooltip; import javafx.scene.input.MouseEvent; import javafx.scene.layout.AnchorPane; import javafx.scene.paint.Color; @@ -124,6 +125,8 @@ private void setCardLabels() { abilityText.setText(value); // truncatedString); } else if (key.equals("name")) { nameText.setText(value); + } else if (key.equalsIgnoreCase("flavor")) { + nameText.setTooltip(new Tooltip(value)); } } abilityText.setText(abilityText.getText() + CardHelper.stringResources(this.card));