From 7b799eb531a05e849af3eb7eb17936a76f64d642 Mon Sep 17 00:00:00 2001 From: drdev Date: Thu, 23 Jan 2014 23:15:08 +0000 Subject: [PATCH] Restore borders that were accidentally removed from scroll panes --- .../main/java/forge/gui/CardDetailPanel.java | 2 +- .../main/java/forge/gui/CardListViewer.java | 2 +- .../src/main/java/forge/gui/DualListBox.java | 4 +-- .../src/main/java/forge/gui/FNetOverlay.java | 2 +- .../src/main/java/forge/gui/ImportDialog.java | 2 +- .../src/main/java/forge/gui/ListChooser.java | 2 +- .../java/forge/gui/deckeditor/DeckImport.java | 4 +-- .../deckeditor/views/VEditorPreferences.java | 2 +- .../gui/deckeditor/views/VProbabilities.java | 2 +- .../gui/deckeditor/views/VStatistics.java | 2 +- .../home/gauntlet/VSubmenuGauntletBuild.java | 2 +- .../gauntlet/VSubmenuGauntletContests.java | 2 +- .../home/gauntlet/VSubmenuGauntletLoad.java | 2 +- .../gui/home/quest/DialogChooseSets.java | 2 +- .../gui/home/quest/VSubmenuQuestData.java | 2 +- .../gui/home/quest/VSubmenuQuestPrefs.java | 4 +-- .../gui/home/sanctioned/AvatarSelector.java | 12 ++++----- .../home/sanctioned/VSubmenuConstructed.java | 2 +- .../gui/home/settings/VSubmenuAvatars.java | 2 +- .../home/settings/VSubmenuDownloaders.java | 4 +-- .../home/settings/VSubmenuPreferences.java | 2 +- .../home/settings/VSubmenuReleaseNotes.java | 2 +- .../gui/home/variant/VSubmenuArchenemy.java | 2 +- .../gui/home/variant/VSubmenuCommander.java | 2 +- .../gui/home/variant/VSubmenuPlanechase.java | 2 +- .../gui/home/variant/VSubmenuVanguard.java | 2 +- .../java/forge/gui/match/GameLogPanel.java | 2 +- .../gui/match/QuestWinLoseCardViewer.java | 2 +- .../java/forge/gui/match/VAssignDamage.java | 2 +- .../java/forge/gui/match/ViewWinLose.java | 4 +-- .../java/forge/gui/match/views/VAntes.java | 2 +- .../java/forge/gui/match/views/VCommand.java | 2 +- .../java/forge/gui/match/views/VField.java | 2 +- .../java/forge/gui/match/views/VHand.java | 2 +- .../java/forge/gui/match/views/VPrompt.java | 2 +- .../java/forge/gui/toolbox/FScrollPane.java | 25 +++++++++++-------- .../java/forge/gui/toolbox/FScrollPanel.java | 2 +- .../gui/toolbox/itemmanager/ItemManager.java | 2 +- .../forge/gui/toolbox/special/CardViewer.java | 2 +- .../main/java/forge/quest/gui/ViewStall.java | 2 +- forge-gui/src/main/java/forge/view/FView.java | 2 +- 41 files changed, 64 insertions(+), 61 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui/src/main/java/forge/gui/CardDetailPanel.java index d67f8a7d0d8..82f83c899eb 100644 --- a/forge-gui/src/main/java/forge/gui/CardDetailPanel.java +++ b/forge-gui/src/main/java/forge/gui/CardDetailPanel.java @@ -134,7 +134,7 @@ public class CardDetailPanel extends FPanel { this.cdArea.setFont(new java.awt.Font("Dialog", 0, 14)); this.cdArea.setBorder(new EmptyBorder(4, 4, 4, 4)); this.cdArea.setOpaque(false); - this.scrArea = new FScrollPane(this.cdArea); + this.scrArea = new FScrollPane(this.cdArea, true); GridBagConstraints areaConstraints = new GridBagConstraints(); areaConstraints.fill = GridBagConstraints.BOTH; diff --git a/forge-gui/src/main/java/forge/gui/CardListViewer.java b/forge-gui/src/main/java/forge/gui/CardListViewer.java index 88e7712e217..b69bc3be055 100644 --- a/forge-gui/src/main/java/forge/gui/CardListViewer.java +++ b/forge-gui/src/main/java/forge/gui/CardListViewer.java @@ -114,7 +114,7 @@ public class CardListViewer extends FDialog { }); this.add(new FLabel.Builder().text(message).build(), "cell 0 0, spanx 3, gapbottom 4"); - this.add(new FScrollPane(this.jList), "cell 0 1, w 225, growy, pushy, ax c"); + this.add(new FScrollPane(this.jList, true), "cell 0 1, w 225, growy, pushy, ax c"); this.add(this.picture, "cell 1 1, w 225, growy, pushy, ax c"); this.add(this.detail, "cell 2 1, w 225, growy, pushy, ax c"); this.add(btnOK, "cell 1 2, w 150, h 26, ax c, gaptop 6"); diff --git a/forge-gui/src/main/java/forge/gui/DualListBox.java b/forge-gui/src/main/java/forge/gui/DualListBox.java index 68d934071f5..3a107dd2c52 100644 --- a/forge-gui/src/main/java/forge/gui/DualListBox.java +++ b/forge-gui/src/main/java/forge/gui/DualListBox.java @@ -153,7 +153,7 @@ public class DualListBox extends FDialog { FPanel leftPanel = new FPanel(new BorderLayout()); selectOrder = new FLabel.Builder().text("Select Order:").build(); leftPanel.add(selectOrder, BorderLayout.NORTH); - leftPanel.add(new FScrollPane(sourceList), BorderLayout.CENTER); + leftPanel.add(new FScrollPane(sourceList, true), BorderLayout.CENTER); leftPanel.add(okButton, BorderLayout.SOUTH); FPanel centerPanel = new FPanel(new GridLayout(6, 1)); @@ -170,7 +170,7 @@ public class DualListBox extends FDialog { FPanel rightPanel = new FPanel(new BorderLayout()); rightPanel.add(orderedLabel, BorderLayout.NORTH); - rightPanel.add(new FScrollPane(destList), BorderLayout.CENTER); + rightPanel.add(new FScrollPane(destList, true), BorderLayout.CENTER); rightPanel.add(autoButton, BorderLayout.SOUTH); add(leftPanel, "w 250, h 300"); diff --git a/forge-gui/src/main/java/forge/gui/FNetOverlay.java b/forge-gui/src/main/java/forge/gui/FNetOverlay.java index 6f74c64bfcf..d03b1447db5 100644 --- a/forge-gui/src/main/java/forge/gui/FNetOverlay.java +++ b/forge-gui/src/main/java/forge/gui/FNetOverlay.java @@ -78,7 +78,7 @@ public enum FNetOverlay { txtLog.setFocusable(true); txtLog.setBackground(FSkin.getColor(FSkin.Colors.CLR_ZEBRA)); - FScrollPane _operationLogScroller = new FScrollPane(txtLog); + FScrollPane _operationLogScroller = new FScrollPane(txtLog, false); _operationLogScroller.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); new SmartScroller(_operationLogScroller); pnl.add(_operationLogScroller, "pushx, hmin 24, pushy, growy, growx, gap 2px 2px 2px 0, sx 2"); diff --git a/forge-gui/src/main/java/forge/gui/ImportDialog.java b/forge-gui/src/main/java/forge/gui/ImportDialog.java index a9fb8dddd5f..b82b47e530a 100644 --- a/forge-gui/src/main/java/forge/gui/ImportDialog.java +++ b/forge-gui/src/main/java/forge/gui/ImportDialog.java @@ -127,7 +127,7 @@ public class ImportDialog { blurbPanelInterior.add(new FLabel.Builder().text( "Remember, your data won't be available until you complete this step!").build(), "growx, w 50:50:"); - FScrollPane blurbScroller = new FScrollPane(blurbPanelInterior, + FScrollPane blurbScroller = new FScrollPane(blurbPanelInterior, true, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); blurbPanel.add(blurbScroller, "hmin 150, growy, growx, center, gap 0 0 5 5"); _topPanel.add(blurbPanel, "gap 10 10 20 0, growy, growx, w 50:50:"); diff --git a/forge-gui/src/main/java/forge/gui/ListChooser.java b/forge-gui/src/main/java/forge/gui/ListChooser.java index d07c73ebe12..a6ac55cce5e 100644 --- a/forge-gui/src/main/java/forge/gui/ListChooser.java +++ b/forge-gui/src/main/java/forge/gui/ListChooser.java @@ -103,7 +103,7 @@ public class ListChooser { this.lstChoices.setCellRenderer(new TransformedCellRenderer(display)); } - FScrollPane listScroller = new FScrollPane(this.lstChoices); + FScrollPane listScroller = new FScrollPane(this.lstChoices, true); int minWidth = this.lstChoices.getAutoSizeWidth(); if (this.lstChoices.getModel().getSize() > this.lstChoices.getVisibleRowCount()) { minWidth += listScroller.getVerticalScrollBar().getPreferredSize().width; diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java b/forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java index f9b6fa93d73..43db49ad3cd 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java @@ -89,8 +89,8 @@ public class DeckImport ex + ""; private final FHtmlViewer htmlOutput = new FHtmlViewer(DeckImport.HTML_WELCOME_TEXT); - private final FScrollPane scrollInput = new FScrollPane(this.txtInput); - private final FScrollPane scrollOutput = new FScrollPane(this.htmlOutput); + private final FScrollPane scrollInput = new FScrollPane(this.txtInput, false); + private final FScrollPane scrollOutput = new FScrollPane(this.htmlOutput, false); private final FLabel summaryMain = new FLabel.Builder().text("Imported deck summary will appear here").build(); private final FLabel summarySide = new FLabel.Builder().text("Line for sideboard summary").build(); private final FButton cmdAccept = new FButton("Import Deck"); diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java index eb561578fc0..d10c17e1443 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java @@ -67,7 +67,7 @@ public enum VEditorPreferences implements IVDoc { private FCheckBox chbCardDisplayUnique = new FCheckBox("Show unique cards only (only affects Constructed)"); private JPanel pnl = new JPanel(new MigLayout("insets 0, gap 0, wrap 2, ax left")); - private FScrollPane scroller = new FScrollPane(pnl); + private FScrollPane scroller = new FScrollPane(pnl, false); //========== Constructor private VEditorPreferences() { diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java index db8dfd342be..9db7d7dbd8a 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java @@ -49,7 +49,7 @@ public enum VProbabilities implements IVDoc { // Layout containers private final JPanel pnlContent = new JPanel(new MigLayout("insets 0, gap 0, wrap")); - private final FScrollPane scroller = new FScrollPane(pnlContent); + private final FScrollPane scroller = new FScrollPane(pnlContent, false); private final JPanel pnlHand = new JPanel(new MigLayout("insets 0, gap 0, wrap")); private final JPanel pnlLibrary = new JPanel(new MigLayout("insets 0, gap 0, wrap")); diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java index a908dbef551..a58e2b51da1 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java @@ -69,7 +69,7 @@ public enum VStatistics implements IVDoc { private final FLabel lblCMC6 = buildLabel(SItemManagerUtil.StatTypes.CMC_6, true); // Layout containers - private final FScrollPane scroller = new FScrollPane(pnlStats); + private final FScrollPane scroller = new FScrollPane(pnlStats, false); //========== Constructor private VStatistics() { diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletBuild.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletBuild.java index ab8da1f84a5..57f91e01927 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletBuild.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletBuild.java @@ -51,7 +51,7 @@ public enum VSubmenuGauntletBuild implements IVSubmenu { private final FDeckChooser lstLeft = new FDeckChooser(false); private final JList lstRight = new FList(); - private final FScrollPane scrRight = new FScrollPane(lstRight, + private final FScrollPane scrRight = new FScrollPane(lstRight, true, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); private final FTextField txfFilename = new FTextField.Builder().text(GauntletIO.TXF_PROMPT).build(); diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletContests.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletContests.java index 9020f4ca922..d4a200fc69e 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletContests.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletContests.java @@ -46,7 +46,7 @@ public enum VSubmenuGauntletContests implements IVSubmenu { private final QuickGauntletLister gauntletList = new QuickGauntletLister(); - private final FScrollPane scrLoad = new FScrollPane(gauntletList); + private final FScrollPane scrLoad = new FScrollPane(gauntletList, false); private final FLabel lblDesc = new FLabel.Builder().text( "Load a previous gauntlet (uses the deck with which it was started).") diff --git a/forge-gui/src/main/java/forge/gui/home/quest/DialogChooseSets.java b/forge-gui/src/main/java/forge/gui/home/quest/DialogChooseSets.java index 9a24e07c55b..c289229e9c1 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/DialogChooseSets.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/DialogChooseSets.java @@ -139,7 +139,7 @@ public class DialogChooseSets { JPanel pnl = new JPanel(new MigLayout("center, wrap")); pnl.setOpaque(false); pnl.add(new FLabel.Builder().text(title).build()); - pnl.add(new FScrollPane(cbl)); + pnl.add(new FScrollPane(cbl, true)); return pnl; } diff --git a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestData.java b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestData.java index a569555845c..5cb4a9e55da 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestData.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestData.java @@ -66,7 +66,7 @@ public enum VSubmenuQuestData implements IVSubmenu { .fontAlign(SwingConstants.CENTER).fontSize(12).build(); private final QuestFileLister lstQuests = new QuestFileLister(); - private final FScrollPane scrQuests = new FScrollPane(lstQuests); + private final FScrollPane scrQuests = new FScrollPane(lstQuests, false); private final JPanel pnlOptions = new JPanel(); /* Fist column */ diff --git a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java index 6225789164e..1b805863cd0 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java @@ -9,7 +9,6 @@ import java.awt.event.MouseEvent; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; import javax.swing.border.Border; @@ -50,8 +49,7 @@ public enum VSubmenuQuestPrefs implements IVSubmenu { .opaque(true).fontSize(16).build(); private final JPanel pnlContent = new JPanel(); - private final FScrollPane scrContent = new FScrollPane(pnlContent, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, - ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + private final FScrollPane scrContent = new FScrollPane(pnlContent, false); private final JPanel pnlRewards = new JPanel(); private final JPanel pnlDifficulty = new JPanel(); diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java index ab5b9e33a8a..56e6597aafc 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java @@ -39,15 +39,15 @@ public class AvatarSelector extends FDialog { } } - final int width = (int) (this.getOwner().getWidth() * .8); - final int height = (int) (this.getOwner().getHeight() * .8); + final int width = this.getOwner().getWidth() * 3 / 4; + final int height = this.getOwner().getHeight() * 3 / 4; this.setPreferredSize(new Dimension(width, height)); this.setSize(width, height); - FScrollPane scroller = new FScrollPane(pnlAvatarPics); + FScrollPane scroller = new FScrollPane(pnlAvatarPics, false); scroller.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - this.add(scroller, "w 90%!, pushy, growy, gap 5% 0 0 0"); - initialSelection.requestFocusInWindow(); + this.add(scroller, "w 100%-24px!, pushy, growy, gap 12px 0 0 0"); + this.setDefaultFocus(initialSelection); } private FLabel makeAvatarLabel(final SkinImage img0, final int index0, final int oldIndex) { @@ -62,7 +62,7 @@ public class AvatarSelector extends FDialog { lbl.setName("AvatarLabel" + index0); if (oldIndex == index0) { - lbl.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(FSkin.Colors.CLR_BORDERS).alphaColor(255), 3));; + lbl.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(FSkin.Colors.CLR_BORDERS).alphaColor(255), 3)); } selectables.add(lbl); diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java index 6dfd8fd31df..421030e29bf 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java @@ -143,7 +143,7 @@ public enum VSubmenuConstructed implements IVSubmenu { variantsPanel.add(vntArchenemy); comboArchenemy.addTo(variantsPanel); - constructedFrame.add(new FScrollPane(variantsPanel, true, + constructedFrame.add(new FScrollPane(variantsPanel, false, ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED), "w 100%, gapbottom 10px, spanx 2, wrap"); diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuAvatars.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuAvatars.java index 42644b94a30..7342426eac4 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuAvatars.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuAvatars.java @@ -98,7 +98,7 @@ public enum VSubmenuAvatars implements IVSubmenu { pnlAvatars.removeAll(); pnlAvatars.setLayout(new MigLayout("insets 0, gap 0")); pnlAvatars.add(pnlAvatarUsers, "w 90%!, h 150px!, wrap"); - FScrollPane scroller = new FScrollPane(pnlAvatarPics); + FScrollPane scroller = new FScrollPane(pnlAvatarPics, true); scroller.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); pnlAvatars.add(scroller, "w 90%!, pushy, growy, gap 5% 0 0 0"); diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java index 7df28a94f5e..2ea35c3f89b 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java @@ -45,7 +45,7 @@ public enum VSubmenuDownloaders implements IVSubmenu { /** */ private final JPanel pnlContent = new JPanel(new MigLayout("insets 0, gap 0, wrap, ay center")); - private final FScrollPane scrContent = new FScrollPane(pnlContent); + private final FScrollPane scrContent = new FScrollPane(pnlContent, false); private final FLabel btnDownloadSetPics = _makeButton("Download LQ Set Pictures"); private final FLabel btnDownloadPics = _makeButton("Download LQ Card Pictures"); @@ -173,7 +173,7 @@ public enum VSubmenuDownloaders implements IVSubmenu { public void showHowToPlay() { FTextArea directions = new FTextArea(FileUtil.readFileToString(NewConstants.TEXT_HOWTO_FILE)); - final FScrollPane scr = new FScrollPane(directions, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, + final FScrollPane scr = new FScrollPane(directions, false, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); _showDialog(scr, new Runnable() { diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java index 71774f41c83..6cab41c821d 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java @@ -56,7 +56,7 @@ public enum VSubmenuPreferences implements IVSubmenu { /** */ private final JPanel pnlPrefs = new JPanel(); - private final FScrollPane scrContent = new FScrollPane(pnlPrefs, + private final FScrollPane scrContent = new FScrollPane(pnlPrefs, false, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); private final FLabel btnReset = new FLabel.Builder().opaque(true).hoverable(true).text("Reset to Default Settings").build(); diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuReleaseNotes.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuReleaseNotes.java index 5468ac04763..dd208261060 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuReleaseNotes.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuReleaseNotes.java @@ -69,7 +69,7 @@ public enum VSubmenuReleaseNotes implements IVSubmenu { tar.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); tar.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); - scroller = new FScrollPane(tar); + scroller = new FScrollPane(tar, true); pnlMain.add(scroller, "w 100%!, h 100%!"); } diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java index fee71fb3a20..8d40147e489 100644 --- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java +++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java @@ -150,7 +150,7 @@ public enum VSubmenuArchenemy implements IVSubmenu { archenemySchemes.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); - FScrollPane scrSchemes = new FScrollPane(archenemySchemes, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + FScrollPane scrSchemes = new FScrollPane(archenemySchemes, true, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); tempPanel.add(scrSchemes, "h 90%, w 33%, gap 0px 10px 0px 10px, growy, pushy, wrap"); } diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java index 064c2b9602c..c4748ec4a50 100644 --- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java +++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java @@ -156,7 +156,7 @@ public enum VSubmenuCommander implements IVSubmenu { tempPanel.add(typeBtnPanel); - FScrollPane scrDecks = new FScrollPane(tempList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + FScrollPane scrDecks = new FScrollPane(tempList, true, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); tempPanel.add(scrDecks, "w 55%!, h 90%, gap 0px 10px 0px 10px, growy, pushy, wrap"); playerPanels.add(tempPanel); diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java index cbcbf154921..7ff66a33888 100644 --- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java +++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java @@ -154,7 +154,7 @@ public enum VSubmenuPlanechase implements IVSubmenu { tempPlanarDeckList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); - FScrollPane scrPlanes = new FScrollPane(tempPlanarDeckList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + FScrollPane scrPlanes = new FScrollPane(tempPlanarDeckList, true, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); tempPanel.add(scrPlanes, "h 90%, w 20%!, gap 0px 10px 0px 10px, growy, pushy, wrap"); planarDeckLists.add(tempPlanarDeckList); diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java index f773a351e9c..db9b5d81cb3 100644 --- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java +++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java @@ -205,7 +205,7 @@ public enum VSubmenuVanguard implements IVSubmenu { tempPanel.add(new FLabel.Builder().text("Select Avatar:").build(), "gap 0px 0px 10px 10px, flowy"); - FScrollPane scrAvatar = new FScrollPane(tempList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + FScrollPane scrAvatar = new FScrollPane(tempList, true, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); tempPanel.add(scrAvatar, "h 90%, w 33%, gap 0px 10px 0px 10px, growy, pushy, wrap"); tempDetail = new CardDetailPanel(null); diff --git a/forge-gui/src/main/java/forge/gui/match/GameLogPanel.java b/forge-gui/src/main/java/forge/gui/match/GameLogPanel.java index 9ddcf3446fc..08265387be5 100644 --- a/forge-gui/src/main/java/forge/gui/match/GameLogPanel.java +++ b/forge-gui/src/main/java/forge/gui/match/GameLogPanel.java @@ -76,7 +76,7 @@ public class GameLogPanel extends JPanel { * characteristics for the list of {@code JTextArea} log entries. */ private void addNewScrollPane() { - scrollPane = new FScrollPane(); + scrollPane = new FScrollPane(false); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.getViewport().add(scrollablePanel); diff --git a/forge-gui/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java b/forge-gui/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java index 46b62b51338..4dba6bfc948 100644 --- a/forge-gui/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java +++ b/forge-gui/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java @@ -64,7 +64,7 @@ public class QuestWinLoseCardViewer extends FPanel { this.jList = new FList(new ChooserListModel()); this.detail = new CardDetailPanel(null); this.picture = new CardPicturePanel(); - this.scroller = new FScrollPane(this.jList); + this.scroller = new FScrollPane(this.jList, false); this.setCornerDiameter(20); this.setBorderToggle(false); diff --git a/forge-gui/src/main/java/forge/gui/match/VAssignDamage.java b/forge-gui/src/main/java/forge/gui/match/VAssignDamage.java index f48cb4ddc3b..2a61ce1e97b 100644 --- a/forge-gui/src/main/java/forge/gui/match/VAssignDamage.java +++ b/forge-gui/src/main/java/forge/gui/match/VAssignDamage.java @@ -176,7 +176,7 @@ public class VAssignDamage { final String wrap = "wrap " + Integer.toString(cols); pnlDefenders.setLayout(new MigLayout("insets 0, gap 0, ax center, " + wrap)); - final FScrollPane scrDefenders = new FScrollPane(pnlDefenders); + final FScrollPane scrDefenders = new FScrollPane(pnlDefenders, false); // Top row of cards... for (final Card c : defenderCards) { diff --git a/forge-gui/src/main/java/forge/gui/match/ViewWinLose.java b/forge-gui/src/main/java/forge/gui/match/ViewWinLose.java index 0b5db832f15..c808a7b5935 100644 --- a/forge-gui/src/main/java/forge/gui/match/ViewWinLose.java +++ b/forge-gui/src/main/java/forge/gui/match/ViewWinLose.java @@ -50,7 +50,7 @@ public class ViewWinLose { final JPanel pnlLeft = new JPanel(); final JPanel pnlRight = new JPanel(); - final FScrollPane scrCustom = new FScrollPane(); + final FScrollPane scrCustom = new FScrollPane(false); pnlCustom = new SkinnedPanel(); btnContinue = new FButton(); @@ -152,7 +152,7 @@ public class ViewWinLose { pnlLeft.add(pnlButtons, "w 100%!"); final JPanel pnlLog = new JPanel(new MigLayout("insets 0, wrap, ax center")); - final FScrollPane scrLog = new FScrollPane(txtLog); + final FScrollPane scrLog = new FScrollPane(txtLog, false); pnlLog.setOpaque(false); pnlLog.add( diff --git a/forge-gui/src/main/java/forge/gui/match/views/VAntes.java b/forge-gui/src/main/java/forge/gui/match/views/VAntes.java index d1e1e4bdf0c..30d6c690229 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VAntes.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VAntes.java @@ -51,7 +51,7 @@ public enum VAntes implements IVDoc { private final DragTab tab = new DragTab("Ante"); private final JPanel pnl = new JPanel(); - private final FScrollPane scroller = new FScrollPane(pnl); + private final FScrollPane scroller = new FScrollPane(pnl, false); private final SortedSet allAntes = new TreeSet(); private Iterable players; diff --git a/forge-gui/src/main/java/forge/gui/match/views/VCommand.java b/forge-gui/src/main/java/forge/gui/match/views/VCommand.java index be6df87f58c..bbb44a5d75f 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VCommand.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VCommand.java @@ -46,7 +46,7 @@ public class VCommand implements IVDoc { private Player player = null; // Top-level containers - private final FScrollPane scroller = new FScrollPane(); + private final FScrollPane scroller = new FScrollPane(false); private final PlayArea tabletop; //========= Constructor diff --git a/forge-gui/src/main/java/forge/gui/match/views/VField.java b/forge-gui/src/main/java/forge/gui/match/views/VField.java index 062c4250402..ae18d404c6c 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VField.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VField.java @@ -61,7 +61,7 @@ public class VField implements IVDoc { private Player player = null; // Top-level containers - private final FScrollPane scroller = new FScrollPane(); + private final FScrollPane scroller = new FScrollPane(false); private final PlayArea tabletop; private final SkinnedPanel avatarArea = new SkinnedPanel(); diff --git a/forge-gui/src/main/java/forge/gui/match/views/VHand.java b/forge-gui/src/main/java/forge/gui/match/views/VHand.java index bb99485d49d..5ff1df8d39a 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VHand.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VHand.java @@ -42,7 +42,7 @@ public class VHand implements IVDoc { // Top-level containers - private final FScrollPane scroller = new FScrollPane(); + private final FScrollPane scroller = new FScrollPane(false); private final HandArea hand = new HandArea(scroller); //========= Constructor diff --git a/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java b/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java index 7e80490440e..3f31f89cfe4 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java @@ -60,7 +60,7 @@ public enum VPrompt implements IVDoc { private final JButton btnOK = new FButton("OK"); private final JButton btnCancel = new FButton("Cancel"); private final FHtmlViewer tarMessage = new FHtmlViewer(); - private final FScrollPane messageScroller = new FScrollPane(tarMessage, + private final FScrollPane messageScroller = new FScrollPane(tarMessage, false, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); private final JLabel lblGames; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FScrollPane.java b/forge-gui/src/main/java/forge/gui/toolbox/FScrollPane.java index a6f17a92a0b..143e4ce1574 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FScrollPane.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FScrollPane.java @@ -25,26 +25,31 @@ public class FScrollPane extends SkinnedScrollPane { private static final SkinColor arrowColor = FSkin.getColor(FSkin.Colors.CLR_TEXT); private final ArrowButton[] arrowButtons; - public FScrollPane() { - this(null); + public FScrollPane(boolean showBorder0) { + this(null, showBorder0); } - public FScrollPane(final Component c0) { - this(c0, false, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + public FScrollPane(final Component c0, boolean showBorder0) { + this(c0, showBorder0, false, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); } - public FScrollPane(final Component c0, boolean useArrowButtons0) { - this(c0, useArrowButtons0, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + public FScrollPane(final Component c0, boolean showBorder0, boolean useArrowButtons0) { + this(c0, showBorder0, useArrowButtons0, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); } - public FScrollPane(final Component c0, final int vertical0, final int horizontal0) { - this(c0, false, vertical0, horizontal0); + public FScrollPane(final Component c0, boolean showBorder0, final int vertical0, final int horizontal0) { + this(c0, showBorder0, false, vertical0, horizontal0); } - public FScrollPane(final Component c0, boolean useArrowButtons0, final int vertical0, final int horizontal0) { + public FScrollPane(final Component c0, boolean showBorder0, boolean useArrowButtons0, final int vertical0, final int horizontal0) { super(c0, vertical0, horizontal0); getVerticalScrollBar().setUnitIncrement(16); getHorizontalScrollBar().setUnitIncrement(16); getViewport().setOpaque(false); setOpaque(false); - setBorder((Border)null); + if (showBorder0) { + setBorder(new FSkin.LineSkinBorder(FSkin.getColor(FSkin.Colors.CLR_BORDERS))); + } + else { + setBorder((Border)null); + } if (useArrowButtons0) { //ensure scrollbar aren't shown getHorizontalScrollBar().setPreferredSize(new Dimension(0, 0)); diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FScrollPanel.java b/forge-gui/src/main/java/forge/gui/toolbox/FScrollPanel.java index 132032ed9b1..77e79464859 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FScrollPanel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FScrollPanel.java @@ -43,7 +43,7 @@ public class FScrollPanel extends FScrollPane { this(layout, useArrowButtons0, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); } public FScrollPanel(final LayoutManager layout, boolean useArrowButtons0, final int vertical0, final int horizontal0) { - super(new JPanel(layout), useArrowButtons0, vertical0, horizontal0); + super(new JPanel(layout), false, useArrowButtons0, vertical0, horizontal0); innerPanel = (JPanel)getViewport().getView(); innerPanel.setOpaque(false); } diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java index 1f8788d8fa4..607f0b5f706 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java @@ -140,7 +140,7 @@ public abstract class ItemManager extends JPanel { this.model = new ItemManagerModel(this, genericType0); this.table = new ItemListView(this, this.model); this.table.setAllowMultipleSelections(false); - this.viewScroller = new FScrollPane(this.table.getComponent()); + this.viewScroller = new FScrollPane(this.table.getComponent(), false); this.viewScroller.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(FSkin.Colors.CLR_TEXT))); this.cbViews.addItem(this.table); } diff --git a/forge-gui/src/main/java/forge/gui/toolbox/special/CardViewer.java b/forge-gui/src/main/java/forge/gui/toolbox/special/CardViewer.java index a00828bfaab..f0b1a47fccf 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/special/CardViewer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/special/CardViewer.java @@ -61,7 +61,7 @@ public class CardViewer extends JPanel { this.detail = new CardDetailPanel(null); this.picture = new CardPicturePanel(); - this.add(new FScrollPane(this.jList)); + this.add(new FScrollPane(this.jList, true)); this.add(this.picture); this.add(this.detail); this.setLayout(new java.awt.GridLayout(1, 3, 6, 0)); diff --git a/forge-gui/src/main/java/forge/quest/gui/ViewStall.java b/forge-gui/src/main/java/forge/quest/gui/ViewStall.java index 5da9272c072..31a8f7c092c 100644 --- a/forge-gui/src/main/java/forge/quest/gui/ViewStall.java +++ b/forge-gui/src/main/java/forge/quest/gui/ViewStall.java @@ -73,7 +73,7 @@ public class ViewStall extends JPanel { this.tpnFluff = new SkinnedTextPane(); this.pnlInventory = new JPanel(); - this.scrInventory = new FScrollPane(this.pnlInventory); + this.scrInventory = new FScrollPane(this.pnlInventory, false); this.parentView = v0; this.lstItemPanels = new ArrayList(); diff --git a/forge-gui/src/main/java/forge/view/FView.java b/forge-gui/src/main/java/forge/view/FView.java index 96f9a5c0b16..7ac34c66ea5 100644 --- a/forge-gui/src/main/java/forge/view/FView.java +++ b/forge-gui/src/main/java/forge/view/FView.java @@ -208,7 +208,7 @@ public enum FView { files.setWrapStyleWord(true); files.setLineWrap(true); files.setEditable(false); - FScrollPane scroller = new FScrollPane(files); + FScrollPane scroller = new FScrollPane(files, true); p.add(scroller, "w 600:100%:100%, h 100:100%:100%, gaptop 10"); SwingUtilities.invokeLater(new Runnable() {