External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 11e85e9080 into 162edb9351

Browse source
This commit is contained in:
Johannes Wolf 2026-01-26 14:03:57 -06:00 • committed by GitHub
commit c91b27a0bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/mage/client/cards/BigCard.java
View file

@ -31,14 +31,10 @@ public class BigCard extends JComponent {
protected Image bigImage;
protected BufferedImage source;
protected volatile BufferedImage foil;
protected UUID cardId;
protected JXPanel panel;
protected int oldWidth;
protected boolean foilState;
protected Thread foilThread;
protected float hue = 0.005f;
protected float dh = 0.005f;
protected EnlargeMode enlargeMode;
public BigCard() {

6
Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
View file

@ -22,9 +22,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="panelLeft" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="panelRight" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -52,7 +50,7 @@
<Component id="panelCommands" alignment="0" max="32767" attributes="0"/>
<Component id="panelInfo" alignment="0" max="32767" attributes="0"/>
<Component id="panelPacks" alignment="0" max="32767" attributes="0"/>
<Component id="panelBigCard" pref="0" max="32767" attributes="0"/>
<Component id="panelBigCard" pref="-2" max="32767" attributes="0"/>
<Component id="panelPlayers" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
@ -70,7 +68,7 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="panelPlayers" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="112" max="32767" attributes="0"/>
<Component id="panelBigCard" min="-2" pref="285" max="-2" attributes="0"/>
<Component id="panelBigCard" min="-2" pref="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>

8
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
View file

@ -966,7 +966,7 @@
.addComponent(panelCommands, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelInfo, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelPacks, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelBigCard, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addComponent(panelBigCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
.addComponent(panelPlayers, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
@ -981,7 +981,7 @@
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(panelPlayers, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 112, Short.MAX_VALUE)
.addComponent(panelBigCard, javax.swing.GroupLayout.PREFERRED_SIZE, 285, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(panelBigCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
@ -1025,9 +1025,7 @@
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(panelLeft, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(panelRight, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addContainerGap())
.addComponent(panelRight, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)