Changeset 343 for trunk/src_apollo/org/apollo/widgets

Timestamp:

10/05/08 13:22:16 (16 years ago)

Author:

bjn8

Message:

GUI Improvements

File:

• trunk/src_apollo/org/apollo/widgets/LinkedTrack.java (modified) (4 diffs)

trunk/src_apollo/org/apollo/widgets/LinkedTrack.java

@@ -850 +850 @@
                 if (Browser._theBrowser == null) return;
                 
+                // Ensure that load bar or any text doesn't spill over widgets invalidation area
+                Area clip = FrameGraphics.getCurrentClip();
+                
+                Shape clipBackUp = g.getClip();
+                
+                Area tmpClip = (clip != null) ? clip : 
+                        new Area(new Rectangle(0, 0, 
+                                        Browser._theBrowser.getContentPane().getWidth(), 
+                                        Browser._theBrowser.getContentPane().getHeight()));
+                
+                tmpClip.intersect(new Area(getBounds()));
+
+                if (tmpClip.isEmpty()) return;
+
+                g.setClip(tmpClip);
+                
                 // Paint backing
                 g.setColor(SampledTrackGraphView.DEFAULT_BACKGROUND_COLOR);
@@ -977 +993 @@
                 // Draw centralized message string
                 if (centralizedMessage != null) {
-        
-                        // Ensure that load bar and text doesn't spill over widgets invalidation area
-                        Area clip = FrameGraphics.getCurrentClip();
-                        
-                        Shape clipBackUp = g.getClip();
-                        
-                        Area tmpClip = (clip != null) ? clip : 
-                                new Area(new Rectangle(0, 0, 
-                                                Browser._theBrowser.getContentPane().getWidth(), 
-                                                Browser._theBrowser.getContentPane().getHeight()));
-                        
-                        tmpClip.intersect(new Area(getBounds()));
-        
-                        if (!tmpClip.isEmpty()) {
-        
-                                g.setClip(tmpClip);
-                                
-                                FontMetrics fm   = g.getFontMetrics(MESSAGE_FONT);
-                                Rectangle2D rect = fm.getStringBounds(centralizedMessage, g);
-        
-                                // Calc centered position
-                                int x = getX() + ((getWidth() / 2) - (int)(rect.getWidth() / 2));
-                                int y = getY() + ((getHeight() / 2) + (int)(rect.getHeight() / 2) - 4);
-                                
-                                // Draw text
-                                g.setFont(MESSAGE_FONT);
-                                g.drawString(centralizedMessage, x, y);
-                                
-                                // Draw add icon if waiting for a link
-                                if (getLink() == null) {
-                                        IconRepository.getIcon("goto.png").paintIcon(null,
-                                                        g, 
-                                                        x - 34, 
-                                                        getY() + (getHeight() / 2) - 12);
-                                }
-                                
-                                g.setClip(clipBackUp);
-                        }
+
+                        FontMetrics fm   = g.getFontMetrics(MESSAGE_FONT);
+                        Rectangle2D rect = fm.getStringBounds(centralizedMessage, g);
+
+                        // Calc centered position
+                        int x = getX() + ((getWidth() / 2) - (int)(rect.getWidth() / 2));
+                        int y = getY() + ((getHeight() / 2) + (int)(rect.getHeight() / 2) - 4);
+                        
+                        // Draw text
+                        g.setFont(MESSAGE_FONT);
+                        g.drawString(centralizedMessage, x, y);
+                        
+                        // Draw add icon if waiting for a link
+                        if (getLink() == null) {
+                                IconRepository.getIcon("goto.png").paintIcon(null,
+                                                g, 
+                                                x - 34, 
+                                                getY() + (getHeight() / 2) - 12);
+                        }
+                                
                 }
 
@@ -1020 +1018 @@
                 if (state != NOT_INITIALIZED && state != FAILED_STATE && state != EMPTY_STATE)
                         nameLabel.paint(g);
+                
+                g.setClip(clipBackUp);
                 
                 super.paintLink((Graphics2D)g);
@@ -1042 +1042 @@
                 xoff += (getX() + track.area.x);
                 yoff += (getY() + track.area.y);
+                
+                if (xoff < getX()) 
+                        xoff = getX();
+                else if ((xoff + rect.getWidth()) > (getX() + getWidth())) 
+                        xoff = (int)(getX() + getWidth() - rect.getWidth());
                 
                 // Draw text