From 87989a2d7b933293bcbf54234c15717017aa711d Mon Sep 17 00:00:00 2001 From: swordmaster2k Date: Mon, 16 Feb 2015 18:47:14 +0000 Subject: [PATCH 1/3] Fixed bug introduced by #2402. Began replace all search from the first tab. Signed-off-by: swordmaster2k --- app/src/processing/app/FindReplace.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/FindReplace.java b/app/src/processing/app/FindReplace.java index df1c95114..5b3ad9c66 100644 --- a/app/src/processing/app/FindReplace.java +++ b/app/src/processing/app/FindReplace.java @@ -421,8 +421,9 @@ public class FindReplace extends JFrame implements ActionListener { public void replaceAll() { if (findField.getText().length() == 0) return; - // move to the beginning - editor.setSelection(0, 0); + + editor.getSketch().setCurrentCode(0); // select the first tab + editor.setSelection(0, 0); // move to the beginning boolean foundAtLeastOne = false; while (true) { From 1d266d89cdf0a074f23d28d59934244d103c3102 Mon Sep 17 00:00:00 2001 From: swordmaster2k Date: Mon, 16 Feb 2015 19:23:59 +0000 Subject: [PATCH 2/3] Took into account the fact that the user can choose to select search all files. Signed-off-by: swordmaster2k --- app/src/processing/app/FindReplace.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/processing/app/FindReplace.java b/app/src/processing/app/FindReplace.java index 5b3ad9c66..89435f75f 100644 --- a/app/src/processing/app/FindReplace.java +++ b/app/src/processing/app/FindReplace.java @@ -422,7 +422,9 @@ public class FindReplace extends JFrame implements ActionListener { if (findField.getText().length() == 0) return; - editor.getSketch().setCurrentCode(0); // select the first tab + if (searchAllFiles) + editor.getSketch().setCurrentCode(0); // select the first tab + editor.setSelection(0, 0); // move to the beginning boolean foundAtLeastOne = false; From 9c1fd0d7451fd8a2d9bf8f78894d971569afe273 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Tue, 26 May 2015 09:26:52 +0200 Subject: [PATCH 3/3] Scrollable menus can be a little higher --- app/src/processing/app/tools/MenuScroller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/processing/app/tools/MenuScroller.java b/app/src/processing/app/tools/MenuScroller.java index e5ac193ae..d92c33a48 100644 --- a/app/src/processing/app/tools/MenuScroller.java +++ b/app/src/processing/app/tools/MenuScroller.java @@ -482,7 +482,7 @@ public class MenuScroller { double screenHeight = java.awt.Toolkit.getDefaultToolkit().getScreenSize().getHeight(); int maxItems = (int) ((screenHeight - arrowMenuItemHeight * 2 - menuBorderHeight) / itemHeight); - maxItems -= maxItems / 3; + maxItems -= maxItems / 4; return maxItems; }