Przeglądaj źródła

Fixes issue 1361: GTK Issues on OpenSolaris

Change-Id: I74b21fade055a95afd2b4c6457fcebe825ad5318
Reviewed-on: http://gerrit.dmdirc.com/498
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 lat temu
rodzic
commit
3ab45dc841

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/PackingTable.java Wyświetl plik

@@ -148,7 +148,7 @@ public class PackingTable extends JTable {
148 148
 
149 149
         final TableColumnModel myColumnModel = getTableHeader().getColumnModel();
150 150
         final int numCols = myColumnModel.getColumnCount();
151
-        final int totalSize = scrollPane.getViewportBorderBounds().width;
151
+        final int totalSize = (int) (scrollPane.getViewportBorderBounds().width * 0.99);
152 152
         final int[] widths = new int[numCols];
153 153
         int widthsTotal = 0;
154 154
 

+ 1
- 2
src/com/dmdirc/addons/ui_swing/components/TreeScroller.java Wyświetl plik

@@ -57,8 +57,7 @@ public class TreeScroller implements MouseWheelListener {
57 57
         this.selectionModel = tree.getSelectionModel();
58 58
 
59 59
         rootVisible = tree.isRootVisible();
60
-        rootNode =
61
-                (DefaultMutableTreeNode) tree.getModel().getRoot();
60
+        rootNode = (DefaultMutableTreeNode) tree.getModel().getRoot();
62 61
 
63 62
         tree.addMouseWheelListener(this);
64 63
     }

+ 1
- 0
src/com/dmdirc/addons/ui_swing/components/URLProtocolPanel.java Wyświetl plik

@@ -101,6 +101,7 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
101 101
 
102 102
     /** Initialises the components. */
103 103
     private void initComponents() {
104
+        setOpaque(false);
104 105
         showFileChooser = new JButton("Browse");
105 106
         commandPath = new JTextField();
106 107
         optionType = new ButtonGroup();

+ 3
- 2
src/com/dmdirc/addons/ui_swing/components/colours/ColourChooser.java Wyświetl plik

@@ -22,7 +22,6 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.colours;
24 24
 
25
-import com.dmdirc.addons.ui_swing.components.*;
26 25
 import com.dmdirc.ui.messages.ColourManager;
27 26
 import com.dmdirc.addons.ui_swing.UIUtilities;
28 27
 
@@ -36,6 +35,7 @@ import java.awt.event.ActionListener;
36 35
 import javax.swing.BorderFactory;
37 36
 import javax.swing.JButton;
38 37
 import javax.swing.JPanel;
38
+import javax.swing.UIManager;
39 39
 import javax.swing.event.EventListenerList;
40 40
 
41 41
 import net.miginfocom.swing.MigLayout;
@@ -64,7 +64,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
64 64
     /** The value of this component. */
65 65
     private String value;
66 66
     /** Event listeners. */
67
-    private EventListenerList listeners;
67
+    private final EventListenerList listeners;
68 68
     /** Action command. */
69 69
     private String command;
70 70
     /** Parent window. */
@@ -131,6 +131,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
131 131
         previewPanel = new JPanel();
132 132
         previewPanel.setPreferredSize(new Dimension(40, 10));
133 133
         previewPanel.setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
134
+        setOpaque(false);
134 135
 
135 136
         setLayout(new MigLayout("ins 0, fill"));
136 137
 

+ 3
- 1
src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java Wyświetl plik

@@ -22,7 +22,6 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.colours;
24 24
 
25
-import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
26 25
 import com.dmdirc.ui.messages.ColourManager;
27 26
 import com.dmdirc.util.ListenerList;
28 27
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -38,6 +37,7 @@ import javax.swing.BorderFactory;
38 37
 import javax.swing.JButton;
39 38
 import javax.swing.JCheckBox;
40 39
 import javax.swing.JPanel;
40
+import javax.swing.UIManager;
41 41
 
42 42
 import net.miginfocom.swing.MigLayout;
43 43
 
@@ -141,6 +141,8 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
141 141
         enabled.setPreferredSize(new Dimension(40, 40));
142 142
         enabled.setSelected(initialState);
143 143
         enabled.addActionListener(this);
144
+        enabled.setOpaque(false);
145
+        setOpaque(false);
144 146
 
145 147
         setLayout(new MigLayout("fill, ins 0"));
146 148
 

+ 2
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java Wyświetl plik

@@ -51,7 +51,7 @@ public class ActionTriggersListPanel extends JPanel {
51 51
      */
52 52
     private static final long serialVersionUID = 1;
53 53
     /** Trigger list. */
54
-    private List<ActionType> triggers;
54
+    private final List<ActionType> triggers;
55 55
     /** Listeners. */
56 56
     private final ListenerList listeners = new ListenerList();
57 57
 
@@ -77,6 +77,7 @@ public class ActionTriggersListPanel extends JPanel {
77 77
 
78 78
     /** Initialises the components. */
79 79
     private void initComponents() {
80
+        setOpaque(false);
80 81
         setLayout(new MigLayout("fillx, wrap 2"));
81 82
     }
82 83
 

+ 4
- 6
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelModesPane.java Wyświetl plik

@@ -25,17 +25,17 @@ package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
25 25
 import com.dmdirc.Channel;
26 26
 import com.dmdirc.addons.ui_swing.components.ParamModePanel;
27 27
 import com.dmdirc.addons.ui_swing.UIUtilities;
28
-
29 28
 import com.dmdirc.parser.interfaces.Parser;
29
+
30 30
 import java.awt.Insets;
31 31
 import java.util.Hashtable;
32 32
 import java.util.Map;
33
-import javax.swing.BorderFactory;
34 33
 
34
+import javax.swing.BorderFactory;
35 35
 import javax.swing.JCheckBox;
36 36
 import javax.swing.JPanel;
37
-
38 37
 import javax.swing.UIManager;
38
+
39 39
 import net.miginfocom.swing.MigLayout;
40 40
 
41 41
 /** Non list mode panel. */
@@ -103,8 +103,6 @@ public final class ChannelModesPane extends JPanel {
103 103
             String text;
104 104
             String tooltip;
105 105
 
106
-            final boolean opaque = UIUtilities.getTabbedPaneOpaque();
107
-
108 106
             if (channel.getConfigManager().hasOptionString("server",
109 107
                     "mode" + mode)) {
110 108
                 text = channel.getConfigManager().
@@ -126,7 +124,7 @@ public final class ChannelModesPane extends JPanel {
126 124
             final JCheckBox checkBox = new JCheckBox(text, state);
127 125
             checkBox.setMargin(new Insets(0, 0, 0, 0));
128 126
             checkBox.setToolTipText(tooltip);
129
-            checkBox.setOpaque(opaque);
127
+            checkBox.setOpaque(false);
130 128
 
131 129
             modeCheckBoxes.put(mode, checkBox);
132 130
             if (!channel.getConfigManager().hasOptionString("server",

+ 3
- 5
src/com/dmdirc/addons/ui_swing/dialogs/serversetting/UserModesPane.java Wyświetl plik

@@ -24,8 +24,8 @@ package com.dmdirc.addons.ui_swing.dialogs.serversetting;
24 24
 
25 25
 import com.dmdirc.Server;
26 26
 import com.dmdirc.addons.ui_swing.UIUtilities;
27
-
28 27
 import com.dmdirc.parser.interfaces.Parser;
28
+
29 29
 import java.awt.Insets;
30 30
 import java.util.Hashtable;
31 31
 import java.util.Map;
@@ -33,8 +33,8 @@ import java.util.Map;
33 33
 import javax.swing.BorderFactory;
34 34
 import javax.swing.JCheckBox;
35 35
 import javax.swing.JPanel;
36
-
37 36
 import javax.swing.UIManager;
37
+
38 38
 import net.miginfocom.swing.MigLayout;
39 39
 
40 40
 /** User mode panel. */
@@ -86,8 +86,6 @@ public final class UserModesPane extends JPanel {
86 86
         modeCheckBoxes =
87 87
                 new Hashtable<String, JCheckBox>();
88 88
 
89
-        final boolean opaque = UIUtilities.getTabbedPaneOpaque();
90
-
91 89
         // Lay out all the boolean mode checkboxes
92 90
         for (int i = 0; i < userModes.length();
93 91
                 i++) {
@@ -116,7 +114,7 @@ public final class UserModesPane extends JPanel {
116 114
             final JCheckBox checkBox = new JCheckBox(text, state);
117 115
             checkBox.setMargin(new Insets(0, 0, 0, 0));
118 116
             checkBox.setToolTipText(tooltip);
119
-            checkBox.setOpaque(opaque);
117
+            checkBox.setOpaque(false);
120 118
 
121 119
             modeCheckBoxes.put(mode, checkBox);
122 120
         }

Ładowanie…
Anuluj
Zapisz