Changeset 1054

Timestamp:

04/30/16 21:45:22 (8 years ago)

Author:

davidb

Message:

Delayed drawing of InteractiveWidgets so they end up on top

File:

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

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

@@ -421 +421 @@
                 }
 
-                HashSet<Item> paintedFillsAndLines = new HashSet<Item>();
+
+                                HashSet<Item> paintedFillsAndLines = new HashSet<Item>();
                 // FIRST: Paint widgets swing gui (not expeditee gui) .
                 // Note that these are the anchored widgets
@@ -432 +433 @@
                         InteractiveWidget iw = widgetItor.previous();
                         if (clip == null || clip.intersects(iw.getComponant().getBounds())) {
-                                iw.paint(bg);
-                                PaintItem(bg, iw.getItems().get(4));
                                 paintedFillsAndLines.addAll(iw.getItems());
-                        }
-                }
-
+                                //iw.paint(bg);
+                                //PaintItem(bg, iw.getItems().get(4));
+
+                        }
+                }
+
+                
                 // Filter out items that do not need to be painted
                 List<Item> paintItems;
@@ -466 +469 @@
                 PaintPictures(bg, paintItems, fillOnlyItems, paintedFillsAndLines);
                 PaintLines(bg, visibleItems);
+
+
+                widgetItor = paintWidgets.listIterator(paintWidgets.size());
+                while (widgetItor.hasPrevious()) {
+                        // Paint first-in-last-serve ordering - like swing
+                        // If it is done the other way around then widgets are covered up by
+                        // the box that is supposed to be underneath
+                        InteractiveWidget iw = widgetItor.previous();
+                        if (clip == null || clip.intersects(iw.getComponant().getBounds())) {
+                                iw.paint(bg);
+                                PaintItem(bg, iw.getItems().get(4));
+                        }
+                }
+
 
                 // Filter out free items that do not need to be painted