Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit ceeb0b2

Browse files
committed
14 adapt correct font size for long name, fix a bug while storing student info
1 parent 2ad36e1 commit ceeb0b2

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed
-39 Bytes
Binary file not shown.

src/cn/rocket/deksrt/main/Entry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private void exportStuInfo() {
124124
sb.append(student.getName()).append("$").append(student.getPinyin()).append("$")
125125
.append(Boolean.valueOf(student.isBoarding())).append(",");
126126
}
127-
sb.replace(sb.length() - 1, sb.length() - 1, ";");
127+
sb.deleteCharAt(sb.length() - 1).append(';');
128128
sb.deleteCharAt(sb.length() - 1);
129129
try (OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(infoFile), StandardCharsets.UTF_8)) {
130130
osw.write(sb.toString());

src/cn/rocket/deksrt/main/GlobalVariables.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cn.rocket.deksrt.main;
22

3-
import cn.rocket.deksrt.util.StudentList;
43
import cn.rocket.deksrt.util.Student;
4+
import cn.rocket.deksrt.util.StudentList;
55

66
/**
77
* @author Rocket

src/cn/rocket/deksrt/main/MainWindow.java

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import javafx.scene.control.Label;
1616
import javafx.scene.layout.GridPane;
1717
import javafx.scene.paint.Paint;
18+
import javafx.scene.text.Font;
1819
import javafx.stage.Stage;
1920

2021
import java.io.File;
@@ -34,6 +35,8 @@ public class MainWindow {
3435
private JFXTextField[][] textfields;
3536
private Student[][] students;
3637
private int index;
38+
private static final Font size15 = new Font(15);
39+
private static final Font size12 = new Font(12);
3740

3841
@FXML
3942
JFXCheckBox quickSwapCB;
@@ -104,13 +107,17 @@ void initialize() throws IllegalAccessException {
104107
textfields = new JFXTextField[7][8];
105108

106109
for (AutoIterator i = new AutoIterator(AutoIterator.SQUARE_ARRAY); i.hasNextWithUpdate(); i.next()) {
107-
btns[i.y][i.x] = new JFXButton();
108-
btns[i.y][i.x].setPrefSize(80, 45);
109-
btns[i.y][i.x].setOnAction(new ButtonEventHandler(i.x, i.y));
110-
111-
textfields[i.y][i.x] = new JFXTextField();
112-
textfields[i.y][i.x].setVisible(false);
113-
textfields[i.y][i.x].setDisable(true);
110+
JFXButton btn = new JFXButton();
111+
btns[i.y][i.x] = btn;
112+
btn.setPrefSize(80, 45);
113+
btn.setOnAction(new ButtonEventHandler(i.x, i.y));
114+
btn.setFont(size15);
115+
116+
JFXTextField textField = new JFXTextField();
117+
textfields[i.y][i.x] = textField;
118+
textField.setFont(size15);
119+
textField.setVisible(false);
120+
textField.setDisable(true);
114121
}
115122
for (AutoIterator i = new AutoIterator(AutoIterator.GRID0); i.hasNextWithUpdate(); i.next()) {
116123
grid0.add(btns[i.y][i.x], i.x, i.y);
@@ -207,6 +214,10 @@ private void updateTable(int x, int y) {
207214
btn.setText("");
208215
} else {
209216
btn.setText(students[y][x].getName());
217+
if (btn.getText().length()>4)
218+
btn.setFont(size12);
219+
else
220+
btn.setFont(size15);
210221
btn.setTextFill(students[y][x].isBoarding() ? Paint.valueOf("BLUE") : Paint.valueOf("GREEN"));
211222
}
212223
if (btn.isDisable())

0 commit comments

Comments
 (0)