external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix attempt #7 on FPanel: setClip restored.

Browse Source
This commit is contained in:
Doublestrike
2012-02-14 06:19:51 +00:00
parent 5a24db0bcc
commit b155eb7605
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/forge/view/toolbox/FPanel.java
View File

@@ -21,6 +21,7 @@ import java.awt.Color;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Image; import java.awt.Image;
import java.awt.Rectangle;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
@@ -196,16 +197,10 @@ public class FPanel extends JPanel {
final Graphics2D g2d = (Graphics2D) graphics0.create(); final Graphics2D g2d = (Graphics2D) graphics0.create();
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
//EXPERIMENTAL DEBUGGING final Rectangle oldClipBounds = g2d.getClipBounds();
if (this.backgroundTexture == null) { clip = new Area(new RoundRectangle2D.Float(0, 0, pnlW, pnlH, cornerDiameter, cornerDiameter));
drawBackgroundColor(g2d); g2d.setClip(clip);
}
else {
drawBackgroundTexture(g2d);
}
////////////////////////
/*
// Draw background as required // Draw background as required
if (foregroundStretch && foregroundImage != null) { if (foregroundStretch && foregroundImage != null) {
drawForegroundStretched(g2d); drawForegroundStretched(g2d);
@@ -228,7 +223,8 @@ public class FPanel extends JPanel {
// Clear memory // Clear memory
if (clip != null) { clip.reset(); } if (clip != null) { clip.reset(); }
g2d.dispose();*/ g2d.setClip(oldClipBounds);
g2d.dispose();
} }
//========== Special draw methods //========== Special draw methods
@@ -262,9 +258,6 @@ public class FPanel extends JPanel {
} }
private void drawForegroundScaled(final Graphics2D g2d0) { private void drawForegroundScaled(final Graphics2D g2d0) {
clip = new Area(new RoundRectangle2D.Float(0, 0, pnlW, pnlH, cornerDiameter, cornerDiameter));
g2d0.setClip(clip);
// Scaling 1: First dimension larger than panel // Scaling 1: First dimension larger than panel
if (imgW >= pnlW) { // Image is wider than panel? Shrink to width. if (imgW >= pnlW) { // Image is wider than panel? Shrink to width.
scaledW = pnlW; scaledW = pnlW;