Changeset 147 for trunk/src/org/expeditee/gui/FrameGraphics.java

Timestamp:

07/18/08 14:28:41 (16 years ago)

Author:

ra33

Message:

Added anchorRight and anchorBottom properties to items...
Fixed bugs with @i item display...
Can now inject properties into enclosed items at the same time

File:

• trunk/src/org/expeditee/gui/FrameGraphics.java (modified) (13 diffs)

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

@@ -34 +34 @@
 
         // the maximum size that can be used to paint on
-        private static Dimension _MaxSize = new Dimension(1000,1000);
+        private static Dimension _MaxSize = new Dimension(1000, 1000);
 
         // modes
@@ -126 +126 @@
                 if (DisplayIO.getCurrentFrame() != null) {
                         DisplayIO.getCurrentFrame().setBuffer(null);
-                        DisplayIO.getCurrentFrame().setMaxSize(max);
-                }
-
-                if (newMaxHeight > 0)
-                        MessageBay.updateSize();
+                        DisplayIO.getCurrentFrame().refreshSize(_MaxSize);
+                }
+
+                if (newMaxHeight > 0) {
+                        MessageBay.updateSize();        
+                }
         }
 
@@ -358 +359 @@
 
                         List<Item> freeItemsToPaint = new LinkedList<Item>();
+                        // Dont paint the free items for the other frame in twin frames mode
+                        // if (toPaint == DisplayIO.getCurrentFrame()) {
                         if (clip == null) {
                                 freeItemsToPaint = FreeItems.getInstance();
@@ -371 +374 @@
                                 }
                         }
-
-                        if (isActualFrame /* && toPaint == DisplayIO.getCurrentFrame() */)
+                        // }
+
+                        if (isActualFrame && toPaint == DisplayIO.getCurrentFrame())
                                 PaintPictures(bg, freeItemsToPaint, fillOnlyItems,
                                                 paintedFillsAndLines);
@@ -392 +396 @@
                                                 Line line = (Line) i;
 
-                                                if (toPaint != DisplayIO.getCurrentFrame()) {
+                                                if (toPaint == DisplayIO.getCurrentFrame()) {
+                                                        // If exactly one end of the line is floating...
+                                                        
+                                                        
+                                                        
                                                         if (line.getEndItem().isFloating()
                                                                         ^ line.getStartItem().isFloating()) {
-                                                                lines.add(TransposeLine(line,
-                                                                                line.getEndItem(), toPaint,
-                                                                                FrameMouseActions.getY(), -DisplayIO
-                                                                                                .getMiddle()));
-                                                                lines.add(TransposeLine(line, line
-                                                                                .getStartItem(), toPaint,
-                                                                                FrameMouseActions.getY(), -DisplayIO
-                                                                                                .getMiddle()));
+//                                                              Line l = TransposeLine(line, line.getEndItem(),
+//                                                                              toPaint, 0, 0);
+//                                                              if (l == null)
+//                                                                      l = TransposeLine(line,
+//                                                                                      line.getStartItem(), toPaint, 0, 0);
+//                                                              if (l == null)
+//                                                                      l = line;
+//                                                              lines.add(l);
+                                                        } else{
+                                                                //lines.add(line);
                                                         }
                                                 } else {
-                                                        if (line.getEndItem().isFloating()
-                                                                        ^ line.getStartItem().isFloating()) {
-                                                                Line l = TransposeLine(line, line.getEndItem(),
-                                                                                toPaint, 0, 0);
-                                                                if (l == null)
-                                                                        l = TransposeLine(line,
-                                                                                        line.getStartItem(), toPaint, 0, 0);
-                                                                if (l == null)
-                                                                        l = line;
-                                                                lines.add(l);
-                                                        } else
-                                                                lines.add(line);
+//                                                      if (line.getEndItem().isFloating()
+//                                                                      ^ line.getStartItem().isFloating()) {
+//                                                              lines.add(TransposeLine(line,
+//                                                                              line.getEndItem(), toPaint,
+//                                                                              FrameMouseActions.getY(), -DisplayIO
+//                                                                                              .getMiddle()));
+//                                                              lines.add(TransposeLine(line, line
+//                                                                              .getStartItem(), toPaint,
+//                                                                              FrameMouseActions.getY(), -DisplayIO
+//                                                                                              .getMiddle()));
+//                                                      }
                                                 }
                                         }
@@ -428 +437 @@
                         }
 
-                        if (isActualFrame /* && toPaint == DisplayIO.getCurrentFrame() */)
+                        if (isActualFrame && toPaint == DisplayIO.getCurrentFrame())
                                 PaintNonLinesNonPicture(bg, freeItemsToPaint);
 
                         // Repaint popups / drags...
-                        if (isActualFrame) 
+                        if (isActualFrame)
                                 PopupManager.paintLayeredPane(bg, clip);
 
@@ -438 +447 @@
                 }
 
-                
-                
                 return toPaint.getBuffer();
         }
@@ -477 +484 @@
                                 d.setX(d.getX() + DisplayIO.getMiddle());
                 }
-
+                if (nl != null) {
+                        nl.invalidateAll();
+                        FrameGraphics.requestRefresh(true);
+                }
                 return nl;
         }
@@ -600 +610 @@
                                 int cmp = aArea.compareTo(bArea);
                                 if (cmp == 0) {
-                                        //System.out.println(a.getEnclosureID() + " " + b.getID());
-                                        return new Integer(a.getEnclosureID()).compareTo(b.getEnclosureID());
+                                        // System.out.println(a.getEnclosureID() + " " + b.getID());
+                                        return new Integer(a.getEnclosureID()).compareTo(b
+                                                        .getEnclosureID());
                                 }
                                 return cmp * -1;
@@ -664 +675 @@
                         // For polygons need to make sure all other endpoints are
                         // unHighlighted
-                        if(i.hasPermission(Permission.full))
+                        if (i.hasPermission(Permission.full))
                                 changeHighlightMode(i, Item.HighlightMode.Normal,
                                                 Item.HighlightMode.None);
@@ -716 +727 @@
 
         public static Graphics createGraphics() {
-                //Error messages on start up will call this message before _DisplayGraphics has been initialised
+                // Error messages on start up will call this message before
+                // _DisplayGraphics has been initialised
                 if (_DisplayGraphics == null)
                         return null;
@@ -783 +795 @@
         public static void refresh(boolean useInvalidation) {
 
-                if (_DisplayGraphics == null || _MaxSize.width <= 0 || _MaxSize.height <= 0)
+                if (_DisplayGraphics == null || _MaxSize.width <= 0
+                                || _MaxSize.height <= 0)
                         return;
 
@@ -793 +806 @@
 
                                         for (Rectangle r : damagedAreas) {
-                                                if (clip == null) clip = new Area(r);
-                                                else clip.add(new Area(r));     
+                                                if (clip == null)
+                                                        clip = new Area(r);
+                                                else
+                                                        clip.add(new Area(r));
                                         }
                                         damagedAreas.clear();
-                                        
+
                                 } else if (MessageBay.isDirty()) {
                                         // Paint dirty message bay