diff --git a/res/images/skins/rebel/btnLup.png b/res/images/skins/rebel/btnLup.png index 26a28d34e1c..6c115d054ed 100644 Binary files a/res/images/skins/rebel/btnLup.png and b/res/images/skins/rebel/btnLup.png differ diff --git a/res/images/skins/rebel/btnMup.png b/res/images/skins/rebel/btnMup.png index f71f8d36d89..46d6e9f8b67 100644 Binary files a/res/images/skins/rebel/btnMup.png and b/res/images/skins/rebel/btnMup.png differ diff --git a/res/images/skins/rebel/btnRup.png b/res/images/skins/rebel/btnRup.png index 1f70fe6b5fc..4fa0da6134e 100644 Binary files a/res/images/skins/rebel/btnRup.png and b/res/images/skins/rebel/btnRup.png differ diff --git a/res/images/skins/rebel/font1.ttf b/res/images/skins/rebel/font1.ttf index 8cd78415278..026d5331ea8 100644 Binary files a/res/images/skins/rebel/font1.ttf and b/res/images/skins/rebel/font1.ttf differ diff --git a/res/images/skins/rebel/font2.ttf b/res/images/skins/rebel/font2.ttf index bd62e60aac9..ae15a80ebdb 100644 Binary files a/res/images/skins/rebel/font2.ttf and b/res/images/skins/rebel/font2.ttf differ diff --git a/res/images/skins/rebel/texture1.jpg b/res/images/skins/rebel/texture1.jpg index 7c925524eb3..b6b02da1349 100644 Binary files a/res/images/skins/rebel/texture1.jpg and b/res/images/skins/rebel/texture1.jpg differ diff --git a/res/images/skins/rebel/texture2.jpg b/res/images/skins/rebel/texture2.jpg index 6fc0e6f890f..75a621f202d 100644 Binary files a/res/images/skins/rebel/texture2.jpg and b/res/images/skins/rebel/texture2.jpg differ diff --git a/res/images/skins/rebel/texture3.jpg b/res/images/skins/rebel/texture3.jpg index 023287f74d9..c01bfb91604 100644 Binary files a/res/images/skins/rebel/texture3.jpg and b/res/images/skins/rebel/texture3.jpg differ diff --git a/src/main/java/forge/gui/skin/FRoundedPanel.java b/src/main/java/forge/gui/skin/FRoundedPanel.java index 7aa844fe187..47f3eb1e800 100644 --- a/src/main/java/forge/gui/skin/FRoundedPanel.java +++ b/src/main/java/forge/gui/skin/FRoundedPanel.java @@ -28,7 +28,7 @@ public class FRoundedPanel extends JPanel { private Color borderColor = Color.black; private Dimension shadowDistance = new Dimension(5,5); private int shadowThickness = 5; - private int cornerRadius = 20; // Note: this number is actually diameter. + private int cornerDiameter = 20; /** *

FRoundedPanel.

@@ -56,8 +56,8 @@ public class FRoundedPanel extends JPanel { tempS = skin.getSetting("shadowThickness"); if(tempS != null) { shadowThickness = Integer.parseInt(tempS); } - tempS = skin.getSetting("cornerRadius"); - if(tempS != null) { cornerRadius = Integer.parseInt(tempS); } + tempS = skin.getSetting("cornerDiameter"); + if(tempS != null) { cornerDiameter = Integer.parseInt(tempS); } } /** @@ -94,7 +94,7 @@ public class FRoundedPanel extends JPanel { 0 + (int)shadowDistance.getHeight() + (shadowThickness/2), w - (int)shadowDistance.getWidth() - shadowThickness, h - (int)shadowDistance.getHeight() - shadowThickness, - cornerRadius, cornerRadius); + cornerDiameter, cornerDiameter); // Draw content rectangle (on top of shadow) g2d.setColor(this.getBackground()); @@ -102,16 +102,16 @@ public class FRoundedPanel extends JPanel { 0, 0, w - shadowThickness, h - shadowThickness, - cornerRadius, cornerRadius); + cornerDiameter, cornerDiameter); // Stroke border g2d.setColor(this.borderColor); g2d.setStroke(new BasicStroke(1)); g2d.drawRoundRect( 0,0, - w - shadowThickness, - h - shadowThickness, - cornerRadius, cornerRadius); + w - shadowThickness - 1, + h - shadowThickness - 1, + cornerDiameter, cornerDiameter); } /** @@ -166,17 +166,17 @@ public class FRoundedPanel extends JPanel { } /** - *

setCornerRadius.

- * Sets radius of each corner on rounded panel. + *

setCornerDiameter.

+ * Sets diameter of each corner on rounded panel. * * @param {@link java.lang.Integer} r */ - public void setCornerRadius(int r) { + public void setCornerDiameter(int r) { if(r < 0) { r = 0; } - this.cornerRadius = r*2; + this.cornerDiameter = r*2; } /**