From 489bf300ed21c55f7f01b0bdfd35151ce33bae16 Mon Sep 17 00:00:00 2001
From: Sebastian Hollersbacher <s.hollersbacher@outlook.at>
Date: Mon, 5 Jun 2023 22:26:13 +0200
Subject: [PATCH] Changed layout for close button

Changed size of dialog to not be fixed
Fixed incorrect caseSensitive option
---
 .../widgets/internal/NodeSearchDialog.java    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/internal/NodeSearchDialog.java b/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/internal/NodeSearchDialog.java
index b063ff6f3..9d95637a2 100644
--- a/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/internal/NodeSearchDialog.java
+++ b/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/internal/NodeSearchDialog.java
@@ -39,9 +39,8 @@ public NodeSearchDialog(Shell parent, List<GraphNode> nodes) {
 	}
 
 	private void createDialog(Shell parentShell) {
-		dialog = new Shell(parentShell, SWT.DIALOG_TRIM | SWT.MAX);
+		dialog = new Shell(parentShell, SWT.DIALOG_TRIM | SWT.MAX | SWT.RESIZE);
 		dialog.setText("Find");
-		dialog.setSize(300, 200);
 		GridLayout layout = new GridLayout(2, false);
 		dialog.setLayout(layout);
 
@@ -66,6 +65,7 @@ public void focusLost(FocusEvent e) {
 			}
 		});
 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		gridData.minimumWidth = 200;
 		text.setLayoutData(gridData);
 
 		// 2nd row
@@ -89,8 +89,7 @@ public void focusLost(FocusEvent e) {
 		new Label(dialog, SWT.NULL);
 
 		Composite comp = new Composite(dialog, SWT.NONE);
-		comp.setLayout(new GridLayout(3, false));
-		comp.setLayoutData(new GridData(SWT.RIGHT, SWT.BOTTOM, true, true));
+		comp.setLayout(new GridLayout(2, false));
 
 		nextButton = new Button(comp, SWT.PUSH);
 		nextButton.setText("Next");
@@ -102,11 +101,18 @@ public void focusLost(FocusEvent e) {
 		prevButton.setEnabled(false);
 		prevButton.addListener(SWT.Selection, e -> changeNode(false));
 
+		// 6th row
+		new Label(dialog, SWT.NULL);
+		comp = new Composite(dialog, SWT.NONE);
+		comp.setLayout(new GridLayout(1, false));
+		comp.setLayoutData(new GridData(SWT.RIGHT, SWT.BOTTOM, true, true));
+
 		Button closeButton = new Button(comp, SWT.PUSH);
 		closeButton.setText("Close");
 		closeButton.addListener(SWT.Selection, e -> dialog.close());
 
 		dialog.addDisposeListener(e -> isDisposed = true);
+		dialog.pack();
 	}
 
 	private void searchForNodes() {
@@ -122,11 +128,11 @@ private void searchForNodes() {
 			String nodeText;
 			String search;
 			if (caseSensitive) {
-				nodeText = node.getText().toLowerCase();
-				search = text.getText().toLowerCase();
-			} else {
 				nodeText = node.getText();
 				search = text.getText();
+			} else {
+				nodeText = node.getText().toLowerCase();
+				search = text.getText().toLowerCase();
 			}
 
 			if (searchWhole && nodeText.equals(search) || !searchWhole && nodeText.contains(search)) {