Changeset 125

Timestamp:

07/03/08 19:05:00 (16 years ago)

Author:

bjn8

Message:

Fixed some drawing issues with the message bay

Location:

trunk/src/org/expeditee/gui

Files:

• FrameGraphics.java (modified) (2 diffs)
• MessageBay.java (modified) (8 diffs)

trunk/src/org/expeditee/gui/FrameGraphics.java

@@ -789 +789 @@
                                         for (Rectangle r : damagedAreas) {
                                                 if (clip == null) clip = new Area(r);
-                                                clip.add(new Area(r));  
+                                                else clip.add(new Area(r));     
                                         }
                                         damagedAreas.clear();
-                                } else return; // nothing to render
+                                        
+                                } else if (MessageBay.isDirty()) {
+                                        // Paint dirty message bay
+                                        Graphics dg = _DisplayGraphics.create();
+                                        MessageBay.refresh(true, dg, Item.DEFAULT_BACKGROUND);
+                                        return;
+                                }
                         }
                 
@@ -813 +819 @@
                 // Paint message bay
                 MessageBay.refresh(useInvalidation, dg, Item.DEFAULT_BACKGROUND);
-                
+
                 dg.dispose();
         }

trunk/src/org/expeditee/gui/MessageBay.java

@@ -78 +78 @@
                 _messageLink.setOffset(0, -FrameGraphics.getMaxFrameSize().height);
                 _messageLink.setMaxSize(FrameGraphics.getMaxFrameSize());
-                _messageLink.setPosition(FrameGraphics.getMaxFrameSize().width - MESSAGE_LINK_Y_OFFSET,
-                                MESSAGE_LINK_X);
-                
+                
+                updateLink();
+                initBuffer();
         }
         
@@ -113 +113 @@
                 return _messages;
         }
+        
+        public static boolean isDirty() {
+                return !_dirtyAreas.isEmpty();
+        }
+        
+        public static void invalidateFullBay() {
+                _dirtyAreas.clear();
+                addDirtyArea(new Rectangle(0, FrameGraphics.getMaxFrameSize().height,
+                                _messageBuffer.getWidth(), _messageBuffer.getHeight()));
+        }
+        
+        private static void initBuffer() {
+                if (_messageBuffer == null) {
+                        GraphicsEnvironment ge = GraphicsEnvironment
+                                        .getLocalGraphicsEnvironment();
+                        _messageBuffer = ge.getDefaultScreenDevice()
+                                        .getDefaultConfiguration().createCompatibleVolatileImage(
+                                                        FrameGraphics.getMaxFrameSize().width,
+                                                        (FrameGraphics.isAudienceMode() ? 0 : MESSAGE_BUFFER_HEIGHT));
+                }
+        }
+        
+        
+        private static boolean isLinkInitialized = false;
+        
+        private static void updateLink() {
+                
+                if (!isLinkInitialized && FrameGraphics.getMaxFrameSize().width > 0) {
+                        // set up 'Messages' link on the right hand side
+                        _messageLink.setPosition(FrameGraphics.getMaxFrameSize().width - MESSAGE_LINK_Y_OFFSET,
+                                        MESSAGE_LINK_X);
+                        _messageLink.setOffset(0, -FrameGraphics.getMaxFrameSize().height);
+                        isLinkInitialized = true;
+                        
+                        
+                } else {
+                        _messageLink.setPosition(FrameGraphics.getMaxFrameSize().width - MESSAGE_LINK_Y_OFFSET,
+                                        MESSAGE_LINK_X);
+                }
+        }
+        
+
         
         /**
@@ -129 +171 @@
                         Graphics g, Color background) {
                 
+                if (FrameGraphics.getMaxFrameSize().width <= 0) return;
+                
                 Area clip = null;
+                
                 if (useInvalidation) { // build clip
-                        
 
                         if (!_dirtyAreas.isEmpty()) {
                                 
                                 for (Rectangle r : _dirtyAreas) {
+                                        r.y = (r.y < 0) ? 0 : r.y;
+                                        r.x = (r.x < 0) ? 0 : r.x;
                                         if (clip == null) clip = new Area(r);
-                                        clip.add(new Area(r));  
+                                        else clip.add(new Area(r));     
                                 }
 
                         } else return; // nothing to render
-                        
-                
+
                 }
 
@@ -152 +197 @@
                 // Now repaint to screen
                 if (!FrameGraphics.isAudienceMode()) {
-                        g.setClip(clip);
+                        
+                        // Translate clip to messagebox coords
+                        //clip.transform(t) // TODO
+                        //g.setClip(clip);
+                        
                         g.drawImage(_messageBuffer, 0, FrameGraphics.getMaxFrameSize().height, null);
                 }
@@ -159 +208 @@
         
         private static void updateBuffer(Color background, Area clip) {
-                
-                if (_messageBuffer == null) {
-                        GraphicsEnvironment ge = GraphicsEnvironment
-                                        .getLocalGraphicsEnvironment();
-                        _messageBuffer = ge.getDefaultScreenDevice()
-                                        .getDefaultConfiguration().createCompatibleVolatileImage(
-                                                        FrameGraphics.getMaxFrameSize().width,
-                                                        (FrameGraphics.isAudienceMode() ? 0 : MESSAGE_BUFFER_HEIGHT));
-                }
-
+
+                initBuffer();
+                
                 Graphics2D g = _messageBuffer.createGraphics();
-                
+
                 g.setClip(clip);
-                
+
                 g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
                                 RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
@@ -187 +229 @@
                 }
                 
-                if (_messageLink.getLink() != null &&
-                                (clip == null || _messageLink.isInDrawingArea(clip)))
+                if (//_messageLink.getLink() != null
+                                //&& 
+                                (clip == null || _messageLink.isInDrawingArea(clip))) {
                         FrameGraphics.PaintItem(g, _messageLink);
+                }
                 
                 g.dispose();
@@ -205 +249 @@
                 System.out.println(message);
                 assert (message != null);
-
+                
+                // Invalidate whole area
+                invalidateFullBay();
+                
                 if (_supressMessages)
                         return;
@@ -217 +264 @@
                 if (_creator == null) {
                         _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, true);
-
-                        // set up 'Messages' link on the right hand side
-                        _messageLink.setPosition(FrameGraphics.getMaxFrameSize().width - MESSAGE_LINK_Y_OFFSET,
-                                        MESSAGE_LINK_X);
-                        _messageLink.setOffset(0, -FrameGraphics.getMaxFrameSize().height);
-                }
+                }
+                
+                // set up 'Messages' link on the right hand side
+                updateLink();
 
                 // if the message slots have not all been used yet