External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

GUI Size - Fixed that table header lines were not horizontally moved.

Browse source
This commit is contained in:
LevelX2 2016-02-27 09:15:17 +01:00
parent c34c19c9e8
commit aa015b52e6
7 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -682,6 +682,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
gamePane.watchGame(gameId); gamePane.watchGame(gameId);
setActive(gamePane); setActive(gamePane);
} catch (PropertyVetoException ex) { } catch (PropertyVetoException ex) {
LOGGER.debug("Problem starting watching game " + gameId, ex);
} }
} }
@ -1068,9 +1069,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
if (setActive) { if (setActive) {
setActive(tablesPane); setActive(tablesPane);
} else // if other panel was already shown, mamke sure it's topmost again } else // if other panel was already shown, mamke sure it's topmost again
if (topPanebefore != null) { {
if (topPanebefore != null) {
setActive(topPanebefore); setActive(topPanebefore);
} }
}
} }
public void hideGames() { public void hideGames() {
@ -1417,6 +1420,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
break; break;
case CLIENT_STOP_WATCHING: case CLIENT_STOP_WATCHING:
session.stopWatching(userRequestMessage.getGameId()); session.stopWatching(userRequestMessage.getGameId());
GamePanel gamePanel = getGame(userRequestMessage.getGameId());
if (gamePanel != null) {
gamePanel.removeGame();
}
removeGame(userRequestMessage.getGameId()); removeGame(userRequestMessage.getGameId());
break; break;
case CLIENT_EXIT: case CLIENT_EXIT:

1
Mage.Client/src/main/java/mage/client/cards/CardsList.java
View file

@ -149,7 +149,6 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
private void setGUISize() { private void setGUISize() {
mainTable.getTableHeader().setFont(GUISizeHelper.tableFont); mainTable.getTableHeader().setFont(GUISizeHelper.tableFont);
mainTable.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
mainTable.setFont(GUISizeHelper.tableFont); mainTable.setFont(GUISizeHelper.tableFont);
mainTable.setRowHeight(GUISizeHelper.getTableRowHeight()); mainTable.setRowHeight(GUISizeHelper.getTableRowHeight());
cardDimension = GUISizeHelper.editorCardDimension; cardDimension = GUISizeHelper.editorCardDimension;

2
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -35,7 +35,6 @@ package mage.client.deckeditor;
import java.awt.Color; import java.awt.Color;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.ComponentEvent; import java.awt.event.ComponentEvent;
@ -187,7 +186,6 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
private void setGUISize() { private void setGUISize() {
mainTable.getTableHeader().setFont(GUISizeHelper.tableFont); mainTable.getTableHeader().setFont(GUISizeHelper.tableFont);
mainTable.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
mainTable.setFont(GUISizeHelper.tableFont); mainTable.setFont(GUISizeHelper.tableFont);
mainTable.setRowHeight(GUISizeHelper.getTableRowHeight()); mainTable.setRowHeight(GUISizeHelper.getTableRowHeight());

1
Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
View file

@ -104,7 +104,6 @@ public class TableWaitingDialog extends MageDialog {
private void setGUISize() { private void setGUISize() {
tableSeats.getTableHeader().setFont(GUISizeHelper.tableFont); tableSeats.getTableHeader().setFont(GUISizeHelper.tableFont);
tableSeats.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
tableSeats.setFont(GUISizeHelper.tableFont); tableSeats.setFont(GUISizeHelper.tableFont);
tableSeats.setRowHeight(GUISizeHelper.getTableRowHeight()); tableSeats.setRowHeight(GUISizeHelper.getTableRowHeight());

1
Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java
View file

@ -123,7 +123,6 @@ public class PlayersChatPanel extends javax.swing.JPanel {
private void setGUISize() { private void setGUISize() {
jTablePlayers.getTableHeader().setFont(GUISizeHelper.tableFont); jTablePlayers.getTableHeader().setFont(GUISizeHelper.tableFont);
jTablePlayers.getTableHeader().setPreferredSize(new Dimension((int) jTablePlayers.getTableHeader().getPreferredSize().getWidth(), GUISizeHelper.tableHeaderHeight));
jTablePlayers.setFont(GUISizeHelper.tableFont); jTablePlayers.setFont(GUISizeHelper.tableFont);
jTablePlayers.setRowHeight(GUISizeHelper.getTableRowHeight()); jTablePlayers.setRowHeight(GUISizeHelper.getTableRowHeight());
jScrollPanePlayers.getVerticalScrollBar().setPreferredSize(new Dimension(GUISizeHelper.scrollBarSize, 0)); jScrollPanePlayers.getVerticalScrollBar().setPreferredSize(new Dimension(GUISizeHelper.scrollBarSize, 0));

2
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -294,12 +294,10 @@ public class TablesPanel extends javax.swing.JPanel {
private void setGUISize() { private void setGUISize() {
tableTables.getTableHeader().setFont(GUISizeHelper.tableFont); tableTables.getTableHeader().setFont(GUISizeHelper.tableFont);
tableTables.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
tableTables.setFont(GUISizeHelper.tableFont); tableTables.setFont(GUISizeHelper.tableFont);
tableTables.setRowHeight(GUISizeHelper.getTableRowHeight()); tableTables.setRowHeight(GUISizeHelper.getTableRowHeight());
tableCompleted.getTableHeader().setFont(GUISizeHelper.tableFont); tableCompleted.getTableHeader().setFont(GUISizeHelper.tableFont);
tableCompleted.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
tableCompleted.setFont(GUISizeHelper.tableFont); tableCompleted.setFont(GUISizeHelper.tableFont);
tableCompleted.setRowHeight(GUISizeHelper.getTableRowHeight()); tableCompleted.setRowHeight(GUISizeHelper.getTableRowHeight());

2
Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
View file

@ -154,12 +154,10 @@ public class TournamentPanel extends javax.swing.JPanel {
private void setGUISize() { private void setGUISize() {
tablePlayers.getTableHeader().setFont(GUISizeHelper.tableFont); tablePlayers.getTableHeader().setFont(GUISizeHelper.tableFont);
tablePlayers.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
tablePlayers.setFont(GUISizeHelper.tableFont); tablePlayers.setFont(GUISizeHelper.tableFont);
tablePlayers.setRowHeight(GUISizeHelper.getTableRowHeight()); tablePlayers.setRowHeight(GUISizeHelper.getTableRowHeight());
tableMatches.getTableHeader().setFont(GUISizeHelper.tableFont); tableMatches.getTableHeader().setFont(GUISizeHelper.tableFont);
tableMatches.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
tableMatches.setFont(GUISizeHelper.tableFont); tableMatches.setFont(GUISizeHelper.tableFont);
tableMatches.setRowHeight(GUISizeHelper.getTableRowHeight()); tableMatches.setRowHeight(GUISizeHelper.getTableRowHeight());