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

fixed bug with missing images in the deck editor. small images don't show any more on mouse over

Browse Source
This commit is contained in:
jendave
2011-08-06 03:28:37 +00:00
parent dcf398a685
commit f91467f172
4 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
res/gui/display_layout.xml
View File

@@ -219,7 +219,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>0</int> <int>0</int>
<int>765</int> <int>747</int>
<int>707</int> <int>707</int>
</object> </object>
</void> </void>
@@ -230,7 +230,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>0</int> <int>0</int>
<int>765</int> <int>747</int>
<int>124</int> <int>124</int>
</object> </object>
</void> </void>
@@ -251,7 +251,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>124</int> <int>124</int>
<int>765</int> <int>747</int>
<int>10</int> <int>10</int>
</object> </object>
</void> </void>
@@ -266,7 +266,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>134</int> <int>134</int>
<int>765</int> <int>747</int>
<int>121</int> <int>121</int>
</object> </object>
</void> </void>
@@ -287,7 +287,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>255</int> <int>255</int>
<int>765</int> <int>747</int>
<int>10</int> <int>10</int>
</object> </object>
</void> </void>
@@ -302,7 +302,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>265</int> <int>265</int>
<int>765</int> <int>747</int>
<int>162</int> <int>162</int>
</object> </object>
</void> </void>
@@ -323,7 +323,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>427</int> <int>427</int>
<int>765</int> <int>747</int>
<int>10</int> <int>10</int>
</object> </object>
</void> </void>
@@ -338,7 +338,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>437</int> <int>437</int>
<int>765</int> <int>747</int>
<int>122</int> <int>122</int>
</object> </object>
</void> </void>
@@ -359,7 +359,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>559</int> <int>559</int>
<int>765</int> <int>747</int>
<int>10</int> <int>10</int>
</object> </object>
</void> </void>
@@ -374,7 +374,7 @@
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>286</int> <int>286</int>
<int>569</int> <int>569</int>
<int>765</int> <int>747</int>
<int>138</int> <int>138</int>
</object> </object>
</void> </void>
@@ -408,7 +408,7 @@
<object class="org.jdesktop.swingx.MultiSplitLayout$Divider"> <object class="org.jdesktop.swingx.MultiSplitLayout$Divider">
<void property="bounds"> <void property="bounds">
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>1051</int> <int>1033</int>
<int>0</int> <int>0</int>
<int>10</int> <int>10</int>
<int>707</int> <int>707</int>
@@ -423,9 +423,9 @@
<object id="MultiSplitLayout$Split3" class="org.jdesktop.swingx.MultiSplitLayout$Split"> <object id="MultiSplitLayout$Split3" class="org.jdesktop.swingx.MultiSplitLayout$Split">
<void property="bounds"> <void property="bounds">
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>1061</int> <int>1043</int>
<int>0</int> <int>0</int>
<int>219</int> <int>237</int>
<int>707</int> <int>707</int>
</object> </object>
</void> </void>
@@ -434,10 +434,10 @@
<object class="org.jdesktop.swingx.MultiSplitLayout$Leaf"> <object class="org.jdesktop.swingx.MultiSplitLayout$Leaf">
<void property="bounds"> <void property="bounds">
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>1061</int> <int>1043</int>
<int>0</int> <int>0</int>
<int>219</int> <int>237</int>
<int>396</int> <int>368</int>
</object> </object>
</void> </void>
<void property="name"> <void property="name">
@@ -455,9 +455,9 @@
<object class="org.jdesktop.swingx.MultiSplitLayout$Divider"> <object class="org.jdesktop.swingx.MultiSplitLayout$Divider">
<void property="bounds"> <void property="bounds">
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>1061</int> <int>1043</int>
<int>396</int> <int>368</int>
<int>219</int> <int>237</int>
<int>10</int> <int>10</int>
</object> </object>
</void> </void>
@@ -470,10 +470,10 @@
<object class="org.jdesktop.swingx.MultiSplitLayout$Leaf"> <object class="org.jdesktop.swingx.MultiSplitLayout$Leaf">
<void property="bounds"> <void property="bounds">
<object class="java.awt.Rectangle"> <object class="java.awt.Rectangle">
<int>1061</int> <int>1043</int>
<int>406</int> <int>378</int>
<int>219</int> <int>237</int>
<int>301</int> <int>329</int>
</object> </object>
</void> </void>
<void property="name"> <void property="name">

4
res/main.properties
View File

@@ -52,6 +52,6 @@ quest--properties=quest/quest.properties
lang--transparent-properties=lang/lang.properties lang--transparent-properties=lang/lang.properties
image/base--file=pics image/base--file=/home/clemens/Dokumente/Magic/forge/sharedRes/pics
image/token--file=pics/tokens image/token--file=/home/clemens/Dokumente/Magic/forge/sharedRes/pics/tokens
sound/base--file=sound sound/base--file=sound

7
src/forge/Gui_DeckEditor.java
View File

@@ -377,7 +377,12 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
picture.addMouseListener(new MouseAdapter() { picture.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseEntered(MouseEvent e) { public void mouseEntered(MouseEvent e) {
if(picture.getCard() != null) glassPane.setVisible(true); Card c = picture.getCard();
if(c == null) return;
Image i = ImageCache.getOriginalImage(c);
if(i == null) return;
if(i.getWidth(null) < 300) return;
glassPane.setVisible(true);
} }
}); });
}//addListeners() }//addListeners()

11
src/forge/Gui_Quest_DeckEditor.java
View File

@@ -106,10 +106,6 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD
private CardPicturePanel picture = new CardPicturePanel(null); private CardPicturePanel picture = new CardPicturePanel(null);
private JPanel glassPane; private JPanel glassPane;
public static void main(String[] args) {
}
@Override @Override
public void setTitle(String message) { public void setTitle(String message) {
super.setTitle(message); super.setTitle(message);
@@ -409,7 +405,12 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD
picture.addMouseListener(new MouseAdapter() { picture.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseEntered(MouseEvent e) { public void mouseEntered(MouseEvent e) {
if(picture.getCard() != null) glassPane.setVisible(true); Card c = picture.getCard();
if(c == null) return;
Image i = ImageCache.getOriginalImage(c);
if(i == null) return;
if(i.getWidth(null) < 200) return;
glassPane.setVisible(true);
} }
}); });
}//addListeners() }//addListeners()