JCNC/JNotepad
JCNC/JNotepad
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
gewuyou 2023-10-03 13:22:13 +08:00
parent f6063568bb
commit 429fb3cc07
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/jcnc/jnotepad/model/entity/DirFileModel.java
View File

@ -72,4 +72,8 @@ public class DirFileModel {
public void setIconIsSelected(FontIcon iconIsSelected) { public void setIconIsSelected(FontIcon iconIsSelected) {
this.iconIsSelected = iconIsSelected; this.iconIsSelected = iconIsSelected;
} }
public void setChildFile(List<DirFileModel> childFile) {
this.childFile = childFile;
}
} }

8
src/main/java/org/jcnc/jnotepad/views/manager/DirectorySidebarManager.java
View File

@ -42,7 +42,7 @@ public class DirectorySidebarManager {
private static final DirectorySidebarPane DIRECTORY_SIDEBAR_PANE = DirectorySidebarPane.getInstance(); private static final DirectorySidebarPane DIRECTORY_SIDEBAR_PANE = DirectorySidebarPane.getInstance();
private static final double lastDividerPosition = 0.3; private static final double LAST_DIVIDER_POSITION = 0.3;
/** /**
* 控制文件树显示 * 控制文件树显示
@ -57,13 +57,13 @@ public class DirectorySidebarManager {
double roundedNumber = Double.parseDouble(formattedNumber); double roundedNumber = Double.parseDouble(formattedNumber);
// 分割条位置不等于 代表展开 // 分割条位置不等于 代表展开
if (roundedNumber != 0.0) { if (Double.compare(roundedNumber, 0.0) != 0) {
// 收缩分割条 收缩文件树 // 收缩分割条 收缩文件树
center.setDividerPositions(0.0); center.setDividerPositions(0.0);
} else { } else {
// 展开分割条，文件树 // 展开分割条，文件树
center.setDividerPositions(lastDividerPosition); center.setDividerPositions(LAST_DIVIDER_POSITION);
} }
} }
@ -77,7 +77,7 @@ public class DirectorySidebarManager {
if (bool) { if (bool) {
// 获取分割面板 // 获取分割面板
SplitPane center = (SplitPane) MAIN_BORDER_PANE.getCenter(); SplitPane center = (SplitPane) MAIN_BORDER_PANE.getCenter();
center.setDividerPositions(lastDividerPosition); center.setDividerPositions(LAST_DIVIDER_POSITION);
} }
} }