improved card views

Cardshifter · Feb 3, 2015 · 200a6ac · 200a6ac
1 parent d5c5ccc
commit 200a6ac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/gdx/core/src/com/cardshifter/gdx/DefaultZoneView.java b/gdx/core/src/com/cardshifter/gdx/DefaultZoneView.java
@@ -22,7 +22,7 @@ public DefaultZoneView(CardshifterGame game, ZoneMessage message) {
     @Override
     public void addCard(CardInfoMessage message) {
         CardView view = new CardView(this.game, message);
-        table.add(view.getTable());
+        table.add(view.getTable()).width(120).expandX();
     }
 
     @Override

diff --git a/gdx/core/src/com/cardshifter/gdx/GameScreen.java b/gdx/core/src/com/cardshifter/gdx/GameScreen.java
@@ -45,9 +45,9 @@ public GameScreen(CardshifterGame game, CardshifterClient client, NewGameMessage
 //        leftTable.add(playerViews.get(0).getActor()).row();
 //        leftTable.add(playerViews.get(1).getActor()).row();
         leftTable.add("players");
-        topTable.add(leftTable).left().expandY().fillY();
-        topTable.add(centerTable).center().expandY().fillY();
-        topTable.add(rightTable).right().expandY().fillY();
+        topTable.add(leftTable).left().width(150).expandY().fillY();
+        topTable.add(centerTable).center().expandX().expandY().fill();
+        topTable.add(rightTable).right().width(150).expandY().fillY();
 
         addZoneHolder(centerTable, 1 - this.playerIndex, "Hand");
         addZoneHolder(centerTable, 1 - this.playerIndex, "Battlefield");

diff --git a/gdx/core/src/com/cardshifter/gdx/ui/CardView.java b/gdx/core/src/com/cardshifter/gdx/ui/CardView.java
@@ -19,20 +19,18 @@ public CardView(CardshifterGame game, CardInfoMessage cardInfo) {
         table = new Table(game.skin);
         table.add((String) cardInfo.getProperties().get("name"));
         costs = new HorizontalGroup();
-        table.add(costs);
-        table.row();
+        table.add(costs).row();
         // table.add(image);
         Table textTable = new Table(game.skin);
         textTable.add("Abilities").row();
-        textTable.add("Effect description").row();
+        textTable.add("Effect").row();
         textTable.add("Flavortext").bottom();
-        table.add(textTable);
-        table.add("Type");
+        table.add(textTable).colspan(2).row();
+        table.add("Type").left();
 
         gives = new HorizontalGroup();
         gives.addActor(new Label("ABC", game.skin));
-        gives.addActor(new Label("ABC", game.skin));
-        table.add(gives);
+        table.add(gives).right();
     }
 
     public Table getTable() {