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

[vcs]: NewEditChangelistPanel cosmetic fixes

Browse Source 
* IDEA-107357, IDEA-86333;
This commit is contained in:
Nadya Zabrodina
2016-11-08 20:32:00 +03:00
parent d3d324cb04
commit 7a8e84e78c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources-en/src/messages/VcsBundle.properties
+1 -1
View File
@@ -385,7 +385,7 @@ browse.changes.title=Browse Changes
browse.changes.show.all.button=Show All Changes
browse.changes.show.recent.button=Show Recent Changes
diff.unknown.path.title=Unknown diff
new.changelist.make.active.checkbox=Make this changelist &active
new.changelist.make.active.checkbox=Set &active
composite.change.provider.include.vcs.checkbox=Include changes from {0}
shelf.tab=Shelf
directory.mapping.remove.title=Edit VCS Directory Mapping
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/NewEditChangelistPanel.java
+6
View File
@@ -33,6 +33,7 @@ import com.intellij.util.ui.JBUI;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.border.CompoundBorder;
import java.awt.*;
import java.util.Set;
@@ -75,10 +76,12 @@ public abstract class NewEditChangelistPanel extends JPanel {
gb.weightx = 1;
gb.weighty = 1;
gb.fill = GridBagConstraints.BOTH;
gb.insets = JBUI.insetsTop(2);
myDescriptionTextArea = createEditorField(project, 4);
myDescriptionTextArea.setOneLineMode(false);
add(myDescriptionTextArea, gb);
commentLabel.setLabelFor(myDescriptionTextArea);
gb.insets = JBUI.insetsTop(0);
++ gb.gridy;
gb.gridx = 0;
@@ -88,6 +91,7 @@ public abstract class NewEditChangelistPanel extends JPanel {
final BoxLayout layout = new BoxLayout(myAdditionalControlsPanel, BoxLayout.X_AXIS);
myAdditionalControlsPanel.setLayout(layout);
myMakeActiveCheckBox = new JCheckBox(VcsBundle.message("new.changelist.make.active.checkbox"));
myMakeActiveCheckBox.setBorder(JBUI.Borders.emptyRight(4));
myAdditionalControlsPanel.add(myMakeActiveCheckBox);
add(myAdditionalControlsPanel, gb);
}
@@ -187,6 +191,8 @@ public abstract class NewEditChangelistPanel extends JPanel {
editorField = service.getEditorField(FileTypes.PLAIN_TEXT.getLanguage(), project, editorFeatures);
final int height = editorField.getFontMetrics(editorField.getFont()).getHeight();
editorField.getComponent().setMinimumSize(new Dimension(100, (int)(height * scaleFactor)));
editorField.addSettingsProvider(editor -> editor.getContentComponent()
.setBorder(new CompoundBorder(editor.getContentComponent().getBorder(), JBUI.Borders.emptyLeft(2))));
return editorField;
}