From 77a8e3e7a955e68e00a5e1b98c562ba322e2ca9b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 8 Feb 2016 16:16:19 +0100 Subject: [PATCH] * Some fixes to font size change of chat panels. --- .../java/mage/client/chat/ChatPanelBasic.form | 8 ++++---- .../java/mage/client/chat/ChatPanelBasic.java | 8 ++++---- .../java/mage/client/chat/ChatPanelSeparated.java | 11 +++++++++++ .../mage/client/dialog/PreferencesDialog.form | 15 +++++++++------ .../mage/client/dialog/PreferencesDialog.java | 13 +++++++------ 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.form b/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.form index 0e82ed56e0..80e38b5831 100644 --- a/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.form +++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.form @@ -23,7 +23,7 @@ - + @@ -67,14 +67,14 @@ - + - + - + diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java index 1cca880714..8fe5bda253 100644 --- a/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java +++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java @@ -310,10 +310,10 @@ public class ChatPanelBasic extends javax.swing.JPanel { txtConversation.setOpaque(false); jScrollPaneTxt.setViewportView(txtConversation); - txtMessage.setMaximumSize(new java.awt.Dimension(5000, 60)); - txtMessage.setMinimumSize(new java.awt.Dimension(6, 60)); + txtMessage.setMaximumSize(new java.awt.Dimension(5000, 70)); + txtMessage.setMinimumSize(new java.awt.Dimension(6, 70)); txtMessage.setName(""); // NOI18N - txtMessage.setPreferredSize(new java.awt.Dimension(6, 60)); + txtMessage.setPreferredSize(new java.awt.Dimension(6, 70)); txtMessage.addKeyListener(new java.awt.event.KeyAdapter() { public void keyTyped(java.awt.event.KeyEvent evt) { txtMessageKeyTyped(evt); @@ -330,7 +330,7 @@ public class ChatPanelBasic extends javax.swing.JPanel { layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(jScrollPaneTxt, javax.swing.GroupLayout.DEFAULT_SIZE, 190, Short.MAX_VALUE) + .addComponent(jScrollPaneTxt, javax.swing.GroupLayout.DEFAULT_SIZE, 180, Short.MAX_VALUE) .addGap(0, 0, 0) .addComponent(txtMessage, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) ); diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanelSeparated.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanelSeparated.java index 57cc4fdc4d..d3c1e26105 100644 --- a/Mage.Client/src/main/java/mage/client/chat/ChatPanelSeparated.java +++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanelSeparated.java @@ -27,8 +27,10 @@ */ package mage.client.chat; +import java.awt.Font; import static mage.client.chat.ChatPanelBasic.TIMESTAMP_COLOR; import mage.client.components.ColorPane; +import mage.client.util.FontSizeHelper; import mage.view.ChatMessage; import org.mage.card.arcane.ManaSymbols; @@ -103,6 +105,15 @@ public class ChatPanelSeparated extends ChatPanelBasic { public void setSystemMessagesPane(ColorPane systemMessagesPane) { this.systemMessagesPane = systemMessagesPane; + changeGUISize(FontSizeHelper.getChatFont()); + } + + @Override + public void changeGUISize(Font font) { + if (systemMessagesPane != null) { + systemMessagesPane.setFont(font); + } + super.changeGUISize(font); } } diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form index 8c64527d2c..ef50eb60d3 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form @@ -398,8 +398,8 @@ - - + + @@ -432,9 +432,12 @@ - + + + + @@ -443,14 +446,14 @@ - - + + - + diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java index 2a296082f6..f992e6a6e5 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java @@ -721,18 +721,19 @@ public class PreferencesDialog extends javax.swing.JDialog { guiSize_font.setLayout(new java.awt.BorderLayout()); fontSizeLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - fontSizeLabel.setText("Font Size"); + fontSizeLabel.setText("Size"); fontSizeLabel.setToolTipText("The size of the font used to display text."); guiSize_font.add(fontSizeLabel, java.awt.BorderLayout.CENTER); + fontSizeLabel.getAccessibleContext().setAccessibleName("Size"); - sliderFontSize.setMajorTickSpacing(1); - sliderFontSize.setMaximum(30); + sliderFontSize.setMajorTickSpacing(10); + sliderFontSize.setMaximum(50); sliderFontSize.setMinimum(10); sliderFontSize.setMinorTickSpacing(1); sliderFontSize.setPaintLabels(true); sliderFontSize.setPaintTicks(true); sliderFontSize.setSnapToTicks(true); - sliderFontSize.setToolTipText("The time the appearance of the tooltip window for a card is delayed.
\nIf set to zero, the tooltip window won't be shown at all."); + sliderFontSize.setToolTipText("Size of the font."); guiSize_font.add(sliderFontSize, java.awt.BorderLayout.PAGE_START); javax.swing.GroupLayout tabGuiSizeLayout = new javax.swing.GroupLayout(tabGuiSize); @@ -741,8 +742,8 @@ public class PreferencesDialog extends javax.swing.JDialog { tabGuiSizeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(tabGuiSizeLayout.createSequentialGroup() .addContainerGap() - .addComponent(guiSize_font, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) + .addComponent(guiSize_font, javax.swing.GroupLayout.PREFERRED_SIZE, 222, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(296, Short.MAX_VALUE)) ); tabGuiSizeLayout.setVerticalGroup( tabGuiSizeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)