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

Merge branch 'scrolling' into 'master'

Browse Source 
Workshop: Add scrollbars

Closes #6

See merge request core-developers/forge!4800
This commit is contained in:
Michael Kamensky
2021-05-31 06:43:25 +00:00
parent cd167313b7 2d23a5b37d
commit 51924d16db
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-desktop/src/main/java/forge/screens/workshop/views/VCardScript.java
View File

@@ -14,6 +14,7 @@ import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID; import forge.gui.framework.EDocID;
import forge.gui.framework.IVDoc; import forge.gui.framework.IVDoc;
import forge.screens.workshop.controllers.CCardScript; import forge.screens.workshop.controllers.CCardScript;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextPane; import forge.toolbox.FTextPane;
import forge.util.Localizer; import forge.util.Localizer;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
@@ -32,6 +33,7 @@ public enum VCardScript implements IVDoc<CCardScript> {
private final DragTab tab = new DragTab(Localizer.getInstance().getMessage("lblCardScript")); private final DragTab tab = new DragTab(Localizer.getInstance().getMessage("lblCardScript"));
private final FTextPane txtScript = new FTextPane(); private final FTextPane txtScript = new FTextPane();
private final FScrollPane scrollScript;
private final StyledDocument doc; private final StyledDocument doc;
private final Style error; private final Style error;
@@ -41,6 +43,7 @@ public enum VCardScript implements IVDoc<CCardScript> {
txtScript.setFocusable(true); txtScript.setFocusable(true);
doc = new DefaultStyledDocument(); doc = new DefaultStyledDocument();
txtScript.setDocument(doc); txtScript.setDocument(doc);
scrollScript = new FScrollPane(txtScript, true);
error = doc.addStyle("error", null); error = doc.addStyle("error", null);
error.addAttribute(StyleConstants.Background, Color.red); error.addAttribute(StyleConstants.Background, Color.red);
error.addAttribute(StyleConstants.Bold, Boolean.valueOf(true)); error.addAttribute(StyleConstants.Bold, Boolean.valueOf(true));
@@ -107,6 +110,6 @@ public enum VCardScript implements IVDoc<CCardScript> {
public void populate() { public void populate() {
JPanel body = parentCell.getBody(); JPanel body = parentCell.getBody();
body.setLayout(new MigLayout("insets 1, gap 0, wrap")); body.setLayout(new MigLayout("insets 1, gap 0, wrap"));
body.add(txtScript, "w 100%, h 100%"); body.add(scrollScript, "w 100%, h 100%");
} }
} }