rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Change layout in Find/Replace dialog to render correctly on Linux

Browse Source 
see #2070
This commit is contained in:
Fulvio Ieva 2014-07-17 13:41:48 +02:00 committed by Cristian Maglie
parent 064fc45ba5
commit 13321e3c1b
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/processing/app/FindReplace.java
View File

@ -77,20 +77,35 @@ public class FindReplace extends JFrame implements ActionListener {
setResizable(false); setResizable(false);
this.editor = editor; this.editor = editor;
FlowLayout searchLayout = new FlowLayout(FlowLayout.RIGHT,5,0);
Container pain = getContentPane(); Container pain = getContentPane();
pain.setLayout(null); pain.setLayout(searchLayout);
JLabel findLabel = new JLabel(_("Find:")); JLabel findLabel = new JLabel(_("Find:"));
JLabel replaceLabel = new JLabel(_("Replace with:")); JLabel replaceLabel = new JLabel(_("Replace with:"));
Dimension labelDimension = replaceLabel.getPreferredSize(); Dimension labelDimension = replaceLabel.getPreferredSize();
pain.add(findLabel); JPanel find = new JPanel();
pain.add(replaceLabel);
find.add(findLabel);
find.add(findField = new JTextField(20));
pain.add(find);
JPanel replace = new JPanel();
replace.add(replaceLabel);
replace.add(replaceField = new JTextField(20));
pain.add(replace);
pain.add(findField = new JTextField(20));
pain.add(replaceField = new JTextField(20));
int fieldHeight = findField.getPreferredSize().height; int fieldHeight = findField.getPreferredSize().height;
JPanel checkbox = new JPanel();
// Fill the findString with selected text if no previous value // Fill the findString with selected text if no previous value
if(editor.getSelectedText()!=null && editor.getSelectedText().length()>0) if(editor.getSelectedText()!=null && editor.getSelectedText().length()>0)
findString = editor.getSelectedText(); findString = editor.getSelectedText();
@ -107,7 +122,7 @@ public class FindReplace extends JFrame implements ActionListener {
} }
}); });
ignoreCaseBox.setSelected(ignoreCase); ignoreCaseBox.setSelected(ignoreCase);
pain.add(ignoreCaseBox); checkbox.add(ignoreCaseBox);
wrapAroundBox = new JCheckBox(_("Wrap Around")); wrapAroundBox = new JCheckBox(_("Wrap Around"));
wrapAroundBox.addActionListener(new ActionListener() { wrapAroundBox.addActionListener(new ActionListener() {
@ -116,7 +131,7 @@ public class FindReplace extends JFrame implements ActionListener {
} }
}); });
wrapAroundBox.setSelected(wrapAround); wrapAroundBox.setSelected(wrapAround);
pain.add(wrapAroundBox); checkbox.add(wrapAroundBox);
searchAllFilesBox = new JCheckBox(_("Search all Sketch Tabs")); searchAllFilesBox = new JCheckBox(_("Search all Sketch Tabs"));
searchAllFilesBox.addActionListener(new ActionListener() { searchAllFilesBox.addActionListener(new ActionListener() {
@ -125,11 +140,13 @@ public class FindReplace extends JFrame implements ActionListener {
} }
}); });
searchAllFilesBox.setSelected(searchAllFiles); searchAllFilesBox.setSelected(searchAllFiles);
pain.add(searchAllFilesBox); checkbox.add(searchAllFilesBox);
pain.add(checkbox);
JPanel buttons = new JPanel(); JPanel buttons = new JPanel();
buttons.setLayout(new FlowLayout(FlowLayout.CENTER,BUTTONGAP,0)); buttons.setLayout(new FlowLayout(FlowLayout.CENTER,BUTTONGAP,0));
// ordering is different on mac versus pc // ordering is different on mac versus pc
if (Base.isMacOS()) { if (Base.isMacOS()) {
@ -211,7 +228,7 @@ public class FindReplace extends JFrame implements ActionListener {
buttons.setBounds(EDGE-BUTTONGAP, ypos, buttons.setBounds(EDGE-BUTTONGAP, ypos,
buttonsDimension.width, buttonsDimension.height); buttonsDimension.width, buttonsDimension.height);
ypos += buttonsDimension.height + EDGE; ypos += buttonsDimension.height;
// Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); // Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();