Pārlūkot izejas kodu

fixed a couple of issues with selected node background/foreground colours and rollover colours

git-svn-id: http://svn.dmdirc.com/trunk@3806 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Gregory Holmes 16 gadus atpakaļ
vecāks
revīzija
93846c22ea

+ 1
- 1
src/com/dmdirc/ui/swing/components/renderers/TreeViewTreeCellRenderer.java Parādīt failu

139
      */
139
      */
140
     @Override
140
     @Override
141
     public void mouseDragged(final MouseEvent e) {
141
     public void mouseDragged(final MouseEvent e) {
142
-    //Ignore
142
+        checkMousePosition(e);
143
     }
143
     }
144
 
144
 
145
     /** 
145
     /** 

+ 16
- 6
src/com/dmdirc/ui/swing/framemanager/tree/NodeLabel.java Parādīt failu

68
     private Color activeForeground;
68
     private Color activeForeground;
69
     /** notification set? */
69
     /** notification set? */
70
     private boolean notification;
70
     private boolean notification;
71
+    /** Selected. */
72
+    private boolean selected;
71
 
73
 
72
     /** 
74
     /** 
73
      * Instantiates a new node label.
75
      * Instantiates a new node label.
81
         this.manager = manager;
83
         this.manager = manager;
82
         this.window = window;
84
         this.window = window;
83
         config = IdentityManager.getGlobalConfig();
85
         config = IdentityManager.getGlobalConfig();
86
+        selected = false;
84
 
87
 
85
         setColours();
88
         setColours();
86
 
89
 
128
             }
131
             }
129
             setBackground(activeBackground);
132
             setBackground(activeBackground);
130
             setForeground(activeForeground);
133
             setForeground(activeForeground);
134
+            selected = true;
131
         } else if (!notification) {
135
         } else if (!notification) {
132
             setFont(getFont().deriveFont(Font.PLAIN));
136
             setFont(getFont().deriveFont(Font.PLAIN));
133
             setBackground(manager.getTree().getBackground());
137
             setBackground(manager.getTree().getBackground());
134
             setForeground(manager.getTree().getForeground());
138
             setForeground(manager.getTree().getForeground());
139
+            selected = false;
135
         }
140
         }
141
+        manager.getTree().repaint();
136
     }
142
     }
137
 
143
 
138
     /** {@inheritDoc} */
144
     /** {@inheritDoc} */
149
     @Override
155
     @Override
150
     public void notificationCleared(final Window window) {
156
     public void notificationCleared(final Window window) {
151
         if (equals(window)) {
157
         if (equals(window)) {
152
-            setForeground(manager.getTree().getForeground());
158
+            if (!selected) {
159
+                setForeground(manager.getTree().getForeground());
160
+            }
153
             notification = false;
161
             notification = false;
154
             manager.getTree().repaint();
162
             manager.getTree().repaint();
155
         }
163
         }
184
      * @param rollover rollover state
192
      * @param rollover rollover state
185
      */
193
      */
186
     public void setRollover(final boolean rollover) {
194
     public void setRollover(final boolean rollover) {
187
-        if (rollover) {
188
-            setBackground(rolloverColour);
189
-        } else {
190
-            setBackground(manager.getTree().getBackground());
195
+        if (!selected) {
196
+            if (rollover) {
197
+                setBackground(rolloverColour);
198
+            } else {
199
+                setBackground(manager.getTree().getBackground());
200
+            }
201
+            manager.getTree().repaint();
191
         }
202
         }
192
-        manager.getTree().repaint();
193
     }
203
     }
194
 
204
 
195
     /** {@inheritDoc} */
205
     /** {@inheritDoc} */

Notiek ielāde…
Atcelt
Saglabāt