Explorar el Código

Reset scrollpane when setting response text.

Change-Id: I43836666b447b4b8118d9bb620461eb2a55b6d5b
Fixes-Issue: CLIENT-516
Reviewed-on: http://gerrit.dmdirc.com/3628
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
changes/28/3628/2
Greg Holmes hace 10 años
padre
commit
4b5728fab6

+ 6
- 2
src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java Ver fichero

@@ -23,6 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
24 24
 
25 25
 import com.dmdirc.ClientModule.GlobalConfig;
26
+import com.dmdirc.addons.ui_swing.UIUtilities;
26 27
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
27 28
 import com.dmdirc.addons.ui_swing.components.validating.ValidationFactory;
28 29
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
@@ -68,6 +69,7 @@ public class AliasManagerDialog extends StandardDialog {
68 69
         final JTextArea response = new JTextArea();
69 70
         final JButton addAlias = new JButton("Add Alias");
70 71
         final JButton deleteAlias = new JButton("Delete Alias");
72
+        final JScrollPane responseScroll = new JScrollPane(response);
71 73
         getOkButton();
72 74
         getCancelButton();
73 75
         setMinimumSize(new Dimension(800, 400));
@@ -88,16 +90,18 @@ public class AliasManagerDialog extends StandardDialog {
88 90
         add(ValidationFactory.getValidatorPanel(command, model.getCommandValidator(), iconManager),
89 91
                 "growx, pushx");
90 92
         add(argumentsNumber, "growx, pushx");
91
-        add(ValidationFactory.getValidatorPanel(new JScrollPane(response), response,
93
+        add(ValidationFactory.getValidatorPanel(responseScroll, response,
92 94
                 new NotEmptyValidator(), iconManager), "spanx 2, grow, push");
93 95
 
94 96
         add(getLeftButton(), "flowx, split 3, right, sg button");
95 97
         add(getRightButton(), "sg button");
96 98
 
99
+        UIUtilities.addUndoManager(response);
100
+
97 101
         linker.bindCommandList(aliasList);
98 102
         linker.bindCommand(command);
99 103
         linker.bindArgumentsNumber(argumentsNumber);
100
-        linker.bindResponse(response);
104
+        linker.bindResponse(response, responseScroll);
101 105
         linker.bindAddAlias(addAlias);
102 106
         linker.bindDeleteAlias(deleteAlias);
103 107
         linker.bindOKButton(getOkButton());

+ 4
- 1
src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerLinker.java Ver fichero

@@ -22,6 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
24 24
 
25
+import com.dmdirc.addons.ui_swing.UIUtilities;
25 26
 import com.dmdirc.addons.ui_swing.components.GenericListModel;
26 27
 import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
27 28
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableListSelectionModel;
@@ -42,6 +43,7 @@ import java.beans.VetoableChangeListener;
42 43
 
43 44
 import javax.swing.JButton;
44 45
 import javax.swing.JList;
46
+import javax.swing.JScrollPane;
45 47
 import javax.swing.JSpinner;
46 48
 import javax.swing.JTextArea;
47 49
 import javax.swing.JTextField;
@@ -202,7 +204,7 @@ public class AliasManagerLinker {
202 204
         });
203 205
     }
204 206
 
205
-    public void bindResponse(final JTextArea response) {
207
+    public void bindResponse(final JTextArea response, final JScrollPane responseScroll) {
206 208
         response.setEnabled(false);
207 209
         response.getDocument().addDocumentListener(new DocumentListener() {
208 210
 
@@ -231,6 +233,7 @@ public class AliasManagerLinker {
231 233
             public void aliasSelectionChanged(final Optional<Alias> alias) {
232 234
                 response.setEnabled(model.isSubstitutionValid());
233 235
                 response.setText(model.getSelectedAliasSubstitution());
236
+                UIUtilities.resetScrollPane(responseScroll);
234 237
             }
235 238
 
236 239
         });

Loading…
Cancelar
Guardar