Skip to content

Folder diff merge buttons fix #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pertsevpv merged 1 commit into from
Dec 15, 2025
Merged

Folder diff merge buttons fix #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions demo-edit-jvm/src/main/java/org/sudu/experiments/TMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.sudu.experiments;

import org.sudu.experiments.diff.FileDiff;
import org.sudu.experiments.diff.FolderDiffScene;
import org.sudu.experiments.diff.UiToolsDemo;
import org.sudu.experiments.editor.Editor1;
import org.sudu.experiments.editor.SelectFileTest;
Expand Down Expand Up @@ -40,6 +41,10 @@ interface FileDiffMain {
static void main(String[] $) { run(FileDiff::new); }
}

interface FolderDiffMain {
static void main(String[] $) { run(FolderDiffScene::new); }
}

interface WindowsDemoMain {
static void main(String[] $) { run(WindowsDemo::new); }
}
Expand Down
12 changes: 7 additions & 5 deletions demo-edit/src/main/java/org/sudu/experiments/diff/FolderDiffWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
public class FolderDiffWindow extends ToolWindow0 {

private static final boolean PRINT_STAT = true;
private static final boolean dummyMergeButtons = true;
private static final boolean dummyMergeButtons = false;

Window window;
Focusable focusSave;
Expand Down Expand Up @@ -263,10 +263,12 @@ private void updateModel() {
rootView.left.model(),
rootView.right.model()
));
rootView.setMergeButtons(null);
if (dummyMergeButtons) {
dummyMergeButtons(rootView.left, true);
dummyMergeButtons(rootView.right, false);
if (leftRoot != null && rightRoot != null) {
rootView.setMergeButtons(null);
if (dummyMergeButtons) {
dummyMergeButtons(rootView.left, true);
dummyMergeButtons(rootView.right, false);
}
}
}

Expand Down
9 changes: 5 additions & 4 deletions demo-edit/src/main/java/org/sudu/experiments/ui/FileTreeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private int getModel(TreeNode[] t, FolderDiffModel[] m, FolderDiffModel model, F
if (isOpened()) {
if (model.children == null) {
for (FileTreeNode child: children)
idx = child.getModel(t, diffType, idx, model.isCompared());
idx = child.getModel(t, m, diffType, idx, model.isCompared());
} else {
int i = 0, j = 0;
for (FolderDiffModel child: model.children) {
Expand All @@ -117,13 +117,14 @@ private int getModel(TreeNode[] t, FolderDiffModel[] m, FolderDiffModel model, F
return idx;
}

private int getModel(TreeNode[] t, int diffType, int idx, boolean compared) {
private int getModel(TreeNode[] t, FolderDiffModel[] m, int diffType, int idx, boolean compared) {
this.diffType = diffType;
t[idx++] = this;
t[idx] = this;
m[idx++] = new FolderDiffModel(null);
setIcon(this, compared);
if (isOpened()) {
for (var child: children)
idx = child.getModel(t, diffType, idx, compared);
idx = child.getModel(t, m, diffType, idx, compared);
}
return idx;
}
Expand Down