From cedda9622fb79f02367e9ae95a0185897f274f07 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Tue, 4 Mar 2014 23:24:18 +0000
Subject: [PATCH] Make combo box render

---
 forge-m-base/src/forge/Forge.java                           | 4 ++--
 forge-m-base/src/forge/screens/settings/SettingsScreen.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-m-base/src/forge/Forge.java b/forge-m-base/src/forge/Forge.java
index 3c00810e207..c3ff899a3a0 100644
--- a/forge-m-base/src/forge/Forge.java
+++ b/forge-m-base/src/forge/Forge.java
@@ -393,7 +393,7 @@ public class Forge implements ApplicationListener {
         }
 
         public void fillTriangle(FSkinColor skinColor, float x1, float y1, float x2, float y2, float x3, float y3) {
-            fillTriangle(skinColor.getColor(), x1, y1, x2, y2, x2, y3);
+            fillTriangle(skinColor.getColor(), x1, y1, x2, y2, x3, y3);
         }
         public void fillTriangle(Color color, float x1, float y1, float x2, float y2, float x3, float y3) {
             batch.end(); //must pause batch while rendering shapes
@@ -405,7 +405,7 @@ public class Forge implements ApplicationListener {
 
             shapeRenderer.begin(ShapeType.Filled);
             shapeRenderer.setColor(color);
-            shapeRenderer.triangle(x1, y1, x2, y2, x3, y3);
+            shapeRenderer.triangle(adjustX(x1), adjustY(y1, 0), adjustX(x2), adjustY(y2, 0), adjustX(x3), adjustY(y3, 0));
             shapeRenderer.end();
 
             if (needBlending) {
diff --git a/forge-m-base/src/forge/screens/settings/SettingsScreen.java b/forge-m-base/src/forge/screens/settings/SettingsScreen.java
index 14efc150fd3..29ec8efabd2 100644
--- a/forge-m-base/src/forge/screens/settings/SettingsScreen.java
+++ b/forge-m-base/src/forge/screens/settings/SettingsScreen.java
@@ -10,11 +10,11 @@ public class SettingsScreen extends FScreen {
     public SettingsScreen() {
         super(true, "Settings", true);
         
-        cmbTheme = new FComboBox<>(FSkin.getAllSkins());
+        cmbTheme = add(new FComboBox<>(FSkin.getAllSkins()));
     }
 
     @Override
     protected void doLayout(float startY, float width, float height) {
-        cmbTheme.setBounds(20, startY + 20, width, 25);
+        cmbTheme.setBounds(20, startY + 20, width - 40, 25);
     }
 }