OSDN > Find Software > Games/Entertainment > delesterandomselector > SCM > git > DelesteRandomSelector > Commit

delesterandomselector
Fork

DelesteRandomSelector: Commit

開発Git

fix: add scroll bar if textarea is full

--- a/database.json

+++ b/database.json

--- a/settings.json

+++ b/settings.json

--- a/src/com/ranfa/main/DelesteRandomSelector.java

+++ b/src/com/ranfa/main/DelesteRandomSelector.java

		@@ -23,8 +23,9 @@ import javax.swing.JFrame;
23	23	import javax.swing.JLabel;
24	24	import javax.swing.JOptionPane;
25	25	import javax.swing.JPanel;
	26	+import javax.swing.JScrollPane;
26	27	import javax.swing.JSpinner;
27		-import javax.swing.JTextPane;
	28	+import javax.swing.JTextArea;
28	29	import javax.swing.border.EmptyBorder;
29	30
30	31	import com.jgoodies.forms.layout.ColumnSpec;

		@@ -59,7 +60,6 @@ public class DelesteRandomSelector extends JFrame {
59	60	private JButton btnImport;
60	61	private JButton btnStart;
61	62	private JButton btnExit;
62		- private JTextPane textPane;
63	63	private JComboBox comboDifficultySelect;
64	64	private JLabel labelLvCaution;
65	65	private JComboBox comboAttribute;

		@@ -67,6 +67,9 @@ public class DelesteRandomSelector extends JFrame {
67	67	private JButton btnTwitterIntegration;
68	68	private String[] integratorArray;
69	69	private boolean integratorBool = false;
	70	+ private JTextArea textArea;
	71	+
	72	+ private JScrollPane scrollPane;
70	73
71	74	/**
72	75	* Launch the application.

		@@ -273,7 +276,7 @@ public class DelesteRandomSelector extends JFrame {
273	276	paneString = paneString + tmp[i];
274	277	}
275	278	paneString = paneString + "この" + tmp.length + "曲をプレイしましょう！！！";
276		- textPane.setText(paneString);
	279	+ textArea.setText(paneString);
277	280	integratorBool = true;
278	281	LimitedLog.println("[" + Thread.currentThread().toString() + "]:" + this.getClass() + ":[INFO]: " + "show up completed.");
279	282	}

		@@ -355,10 +358,12 @@ public class DelesteRandomSelector extends JFrame {
355	358	contentPane.add(panelCentre, BorderLayout.CENTER);
356	359	panelCentre.setLayout(new BorderLayout(0, 0));
357	360
358		- textPane = new JTextPane();
359		- textPane.setText("楽曲選択の手順\r\n１．難易度、属性、レベルを選択する\r\n２．「楽曲取り込み」ボタンを押す！\r\n３．「開始」ボタンを押す！\r\n４．選択された楽曲がここに表示されます！\r\n現在設定されている楽曲選択の最大数：" + property.getSongLimit());
360		- textPane.setEditable(false);
361		- panelCentre.add(textPane);
	361	+ textArea = new JTextArea();
	362	+ textArea.setText("楽曲選択の手順\r\n１．難易度、属性、レベルを選択する\r\n２．「楽曲取り込み」ボタンを押す！\r\n３．「開始」ボタンを押す！\r\n４．選択された楽曲がここに表示されます！\r\n現在設定されている楽曲選択の最大数：" + property.getSongLimit());
	363	+ textArea.setEditable(false);
	364	+
	365	+ scrollPane = new JScrollPane(textArea);
	366	+ panelCentre.add(scrollPane, BorderLayout.CENTER);
362	367	}
363	368
364	369