Changeset 167
- Timestamp:
- 07/28/08 16:52:02 (16 years ago)
- Location:
- trunk/src/org/expeditee/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/DisplayIO.java
r162 r167 22 22 import org.expeditee.items.Picture; 23 23 import org.expeditee.items.Text; 24 import org.expeditee.items.WidgetCacheManager; 24 25 import org.expeditee.stats.SessionStats; 25 26 import org.expeditee.taskmanagement.EntitySaveManager; … … 332 333 333 334 // Remove any popups that are showing on the current frame 334 PopupManager. hideAllPopups();335 PopupManager.getInstance().hideAllPopups(); 335 336 336 337 if (_TwinFrames) { … … 485 486 } 486 487 488 // Heavyduty widgets with lots of data may need to unload 489 WidgetCacheManager.onFrameChanged(); 490 487 491 FrameGraphics.refresh(false); 488 492 } -
trunk/src/org/expeditee/gui/FrameGraphics.java
r156 r167 327 327 // Note that these are the anchored widgets 328 328 for (InteractiveWidget iw : paintWidgets) { 329 329 330 if (clip == null 330 331 || clip.intersects(iw.getComponant().getBounds())) 331 332 iw.paint(bg); 333 334 // Paint borders 335 for (Item i : iw.getItems()) { 336 if (clip == null 337 || i.isInDrawingArea(clip)) 338 i.paint(bg); 339 } 340 332 341 } 333 342 … … 448 457 // Repaint popups / drags... 449 458 if (isActualFrame) 450 PopupManager. paintLayeredPane(bg, clip);459 PopupManager.getInstance().paintLayeredPane(bg, clip); 451 460 452 461 bg.dispose(); … … 824 833 MessageBay.refresh(true, dg, Item.DEFAULT_BACKGROUND); 825 834 return; 826 } 835 836 } else return; // nothing to render 827 837 } 828 838 … … 842 852 // Paint frame to window 843 853 Paint(dg, left, right, Item.DEFAULT_BACKGROUND); 854 855 // Paint any animations 856 PopupManager.getInstance().paintAnimations(); 844 857 845 858 // Paint message bay -
trunk/src/org/expeditee/gui/FrameMouseActions.java
r162 r167 233 233 // + e.getWhen()); 234 234 235 // Auto-hide popups when user clicks into expeditee world236 PopupManager.hideAllPopups();237 238 235 // TODO WHY DID I NOT COMMENT THIS LINE!! MIKE SAYS 239 236 if (LastRobotX != null) { … … 364 361 // This is where all the processing happens 365 362 public void mouseReleased(MouseEvent e) { 363 366 364 // System.out.println("Released " + e.getX() + "," + e.getY() + " " + 367 365 // e.getWhen()); 368 366 FrameUtils.ResponseTimer.restart(); 367 368 // Auto-hide popups when user clicks into expeditee world 369 // If the user clicks into empty space and a popup-is showing, then 370 // the user porbably wants to click away the popup - therefore ignore the event 371 boolean shouldConsume = PopupManager.getInstance().shouldConsumeBackClick(); 372 PopupManager.getInstance().hideAllPopups(); 373 if (shouldConsume && e.getButton() == MouseEvent.BUTTON1) { 374 return; // consume back click event 375 } 369 376 370 377 // _lastMovedDistance = new Point(e.getX() - _lastMouseClick.getX(), e
Note:
See TracChangeset
for help on using the changeset viewer.