made sure that effect text and name text fits inside card in JavaFX. F…

…ixes #173
Cardshifter · Jun 1, 2015 · 8b81d31 · 8b81d31
1 parent 604cc33
commit 8b81d31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/cardshifter-fx/src/main/resources/com/cardshifter/client/views/CardBattlefieldDocument.fxml b/cardshifter-fx/src/main/resources/com/cardshifter/client/views/CardBattlefieldDocument.fxml
@@ -2,10 +2,6 @@
 
 <?import javafx.scene.text.*?>
 <?import javafx.scene.shape.*?>
-<?import java.lang.*?>
-<?import java.net.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
@@ -29,8 +25,8 @@
       <Label fx:id="cardId" layoutX="7.0" layoutY="4.0" text="Card Id =" textFill="WHITE" />
 	  <Label fx:id="scrapValue" layoutX="7.0" layoutY="15.0" text="Scrap =" textFill="WHITE" />
       <Label fx:id="creatureType" layoutX="7.0" layoutY="28.0" textFill="WHITE" />
-      <Label fx:id="nameText" layoutX="7.0" layoutY="60.0" text="Scrap =" textFill="WHITE" />
-      <Label fx:id="abilityText" layoutX="7.0" layoutY="80.0" text="" textFill="WHITE" />
+      <Label fx:id="nameText" layoutX="7.0" layoutY="60.0" text="Scrap =" textFill="WHITE" ellipsisString="..." prefWidth="110" />
+      <Label fx:id="abilityText" layoutX="7.0" layoutY="80.0" text="" textFill="WHITE" ellipsisString="..." prefWidth="78" prefHeight="32" />
       <Circle fx:id="sicknessCircle" fill="#bfc6cd" layoutX="44.0" layoutY="44.0" opacity="0.56" radius="37.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" visible="false" />
 
 	  <!-- Scrap Button -->

diff --git a/cardshifter-fx/src/main/resources/com/cardshifter/client/views/CardHandDocument.fxml b/cardshifter-fx/src/main/resources/com/cardshifter/client/views/CardHandDocument.fxml
@@ -2,10 +2,6 @@
 
 <?import javafx.scene.text.*?>
 <?import javafx.scene.shape.*?>
-<?import java.lang.*?>
-<?import java.net.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
@@ -31,8 +27,8 @@
       <Label fx:id="manaCost" layoutX="16.0" layoutY="30.0" text="Mana Cost =" textFill="WHITE" />
       <Label fx:id="scrapCost" layoutX="16.0" layoutY="42.0" text="Scrap Cost =" textFill="WHITE" />
       <Label fx:id="creatureType" layoutX="16.0" layoutY="106.0" textFill="WHITE" />
-      <Label fx:id="nameText" layoutX="16.0" layoutY="125.0" text="Name" textFill="WHITE" />
-      <Label fx:id="abilityText" layoutX="16.0" layoutY="150.0" text="Ability" textFill="WHITE" />
+      <Label fx:id="nameText" layoutX="16.0" layoutY="125.0" text="Name" textFill="WHITE" ellipsisString="..." prefWidth="110" />
+      <Label fx:id="abilityText" layoutX="16.0" layoutY="150.0" text="Ability" textFill="WHITE" ellipsisString="..." prefWidth="110" prefHeight="32" />
       <Label fx:id="scrapValue" layoutX="16.0" layoutY="55.0" text="Scrap Val =" textFill="WHITE" />
 
    </children>