Browse Source

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 10 years ago
parent
commit
4b5728fab6

+ 6
- 2
src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java View File

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

+ 4
- 1
src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerLinker.java View File

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

Loading…
Cancel
Save