MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Indents in OptionsGroup

Browse Source
This commit is contained in:
Evgeny Zakrevsky
2012-05-14 15:39:07 +04:00
parent 34f3d5c486
commit 398b070919
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class CodeStyleImportsPanel extends JPanel {
}
private JPanel createGeneralOptionsPanel() {
OptionGroup group = new OptionGroup(ApplicationBundle.message("title.general"), true);
OptionGroup group = new OptionGroup(ApplicationBundle.message("title.general"));
myCbUseSingleClassImports = new JCheckBox(ApplicationBundle.message("checkbox.use.single.class.import"));
group.add(myCbUseSingleClassImports);
platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLDialog.java
-1
View File
@@ -112,7 +112,6 @@ public class ExportToHTMLDialog extends DialogWrapper {
CodeEditorBundle.message("export.to.html.select.output.directory.description"),
project, FileChooserDescriptorFactory.createSingleFolderDescriptor());
labeledComponent.setComponent(targetDirectoryField);
labeledComponent.setBorder(BorderFactory.createEmptyBorder(5, 4, 0, 0));
return labeledComponent;
}
platform/platform-api/src/com/intellij/ui/OptionGroup.java
+11 -17
View File
@@ -17,6 +17,7 @@ package com.intellij.ui;
import com.intellij.openapi.util.Pair;
import com.intellij.ui.border.IdeaTitledBorder;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -30,19 +31,13 @@ import java.util.List;
public class OptionGroup implements PanelWithAnchor {
private String myTitle;
private List myOptions;
private List myIsShifted;
private boolean boldTitle;
private List<Boolean> myIsShifted;
private JComponent anchor;
public OptionGroup(String title) {
this(title, false);
}
public OptionGroup(String title, boolean boldTitle) {
public OptionGroup(@Nullable String title) {
myTitle = title;
myOptions = new ArrayList();
myIsShifted = new ArrayList();
this.boldTitle = boldTitle;
myIsShifted = new ArrayList<Boolean>();
}
/**
@@ -75,27 +70,26 @@ public class OptionGroup implements PanelWithAnchor {
panel.setLayout(new GridBagLayout());
for (int i = 0; i < myOptions.size(); i++) {
int leftInset = Boolean.TRUE.equals(myIsShifted.get(i)) ? 15 : 5;
Object option = myOptions.get(i);
final int leftInset = Boolean.TRUE.equals(myIsShifted.get(i)) ? IdeBorderFactory.TITLED_BORDER_INDENT : 0;
final int topInset = i == 0 ? 0 : UIUtil.DEFAULT_VGAP;
final int rightInset = UIUtil.DEFAULT_HGAP;
final Object option = myOptions.get(i);
if (option instanceof JComponent) {
JComponent component = (JComponent)option;
int verticalInset = component instanceof JLabel || component instanceof JTextField ? 2 : 0;
panel.add(component,
new GridBagConstraints(0, i, GridBagConstraints.REMAINDER, 1, 1, 0, GridBagConstraints.WEST, getFill(component),
new Insets(verticalInset, leftInset, verticalInset, 5), 0, 0));
new Insets(topInset, leftInset, 0, 0), 0, 0));
}
else {
Pair pair = (Pair)option;
JComponent firstComponent = (JComponent)pair.first;
int verticalInset = firstComponent instanceof JLabel || firstComponent instanceof JTextField ? 1 : 0;
panel.add(firstComponent,
new GridBagConstraints(0, i, 1, 1, 1, 0, GridBagConstraints.WEST, getFill(firstComponent),
new Insets(verticalInset, leftInset, verticalInset, 5), 0, 0));
new Insets(topInset, leftInset, 0, 0), 0, 0));
JComponent secondComponent = (JComponent)pair.second;
verticalInset = secondComponent instanceof JLabel || secondComponent instanceof JTextField ? 2 : 0;
panel.add(secondComponent,
new GridBagConstraints(1, i, 1, 1, 1, 0, GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL,
new Insets(verticalInset, 5, verticalInset, 5), 0, 0));
new Insets(topInset, rightInset, 0, 0), 0, 0));
}
}
JPanel p = new JPanel();