Browse Source

The popup for the AED triggers should be at least as wide as the combobox and wider if required.

Fixes issue 3740

Change-Id: Ia3f18e1bcc424417317d97fafc262749d5bf25a9
Reviewed-on: http://gerrit.dmdirc.com/855
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 years ago
parent
commit
1954d41816

+ 6
- 5
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java View File

@@ -101,12 +101,13 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
101 101
                         getComponent(0);
102 102
                 Dimension size = scrollPane.getPreferredSize();
103 103
                 if (scrollPane instanceof JScrollPane) {
104
-                    size.width = ((ActionTypeModel) trigger.getModel()).
105
-                            getMaxWidth() + (int) ((JScrollPane) scrollPane).
106
-                            getVerticalScrollBar().getPreferredSize().getWidth();
104
+                    size.width = Math.max(size.width, ((ActionTypeModel)
105
+                            trigger.getModel()).getMaxWidth() + (int)
106
+                            ((JScrollPane) scrollPane).getVerticalScrollBar().
107
+                            getPreferredSize().getWidth());
107 108
                 } else {
108
-                    size.width = ((ActionTypeModel) trigger.getModel()).
109
-                            getMaxWidth();
109
+                    size.width = Math.max(size.width, ((ActionTypeModel)
110
+                            trigger.getModel()). getMaxWidth());
110 111
                 }
111 112
                 scrollPane.setPreferredSize(size);
112 113
                 scrollPane.setMaximumSize(size);

Loading…
Cancel
Save