From a958b4f1b9bab38ad920712d121ab2cea11aa174 Mon Sep 17 00:00:00 2001 From: Jan Peter Stotz Date: Thu, 22 Apr 2021 17:56:06 +0200 Subject: [PATCH] chore(gui): make sure the search dialog has the correct size and the options are aligned properly --- jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java | 4 +++- .../src/main/java/jadx/gui/utils/layout/WrapLayout.java | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java index 84078b30..ea777411 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java @@ -95,7 +95,9 @@ public abstract class CommonSearchDialog extends JDialog { protected abstract void loadStart(); public void loadWindowPos() { - mainWindow.getSettings().loadWindowPos(this); + if (!mainWindow.getSettings().loadWindowPos(this)) { + setSize(800, 500); + } } public void prepare() { diff --git a/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java b/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java index 8800b184..2a399e35 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java @@ -128,10 +128,10 @@ public class WrapLayout extends FlowLayout { if (m.isVisible()) { Dimension d = preferred ? m.getPreferredSize() : m.getMinimumSize(); + int width = d.width; // Can't add the component to current row. Start a new row. - - if (rowWidth + d.width > maxWidth) { + if (rowWidth + width >= maxWidth) { addRow(dim, rowWidth, rowHeight); rowWidth = 0; rowHeight = 0; @@ -143,7 +143,7 @@ public class WrapLayout extends FlowLayout { rowWidth += hgap; } - rowWidth += d.width; + rowWidth += width; rowHeight = Math.max(rowHeight, d.height); } } -- GitLab