Changeset 1561 for trunk/src/org/expeditee/gui/PopupManager.java

Timestamp:

05/19/21 09:01:33 (3 years ago)

Author:

davidb

Message:

A set of changes that spans three things: beat detection, time stretching; and a debug class motivated by the need to look at a canvas redraw issue most notable when a waveform widget is playing

File:

• trunk/src/org/expeditee/gui/PopupManager.java (modified) (5 diffs)

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

@@ -118 +118 @@
                 synchronized(_popups) {
                         for (Popup popup : _popups) {
-                                if (popup.getBounds().contains(p)) {
-                                        return true;
+                                if (popup.getBounds().contains(p) && popup.isShowing()) {
+                                                return true;
                                 }
                         }
@@ -199 +199 @@
         public void paint()
         {
-                //Bryce: popups temporarly disabled due to them not working and interfering in things.
-//              synchronized (_popups) {
-//                      for (Popup popup : _popups) {
-//                              popup.update();
-//                              popup.paint();
-//                      }
-//              }
+                /*
+                if (Browser.DEBUG) {
+                        System.out.println("**** PopupManger::paint() -- num popups in arraylist: " + _popups.size());
+                }
+                */
+                
+                //Bryce: popups temporarily disabled due to them not working and interfering in things.
+                //David: block of code now reintroduced: still some issue but working through them.
+                
+                synchronized (_popups) {
+                        for (Popup popup : _popups) {
+                                popup.update();
+                                popup.paint();
+                        }
+                }
+                
         }
         
@@ -252 +261 @@
                         }
                         
+                        if (Browser.DEBUG) {
+                                System.out.println("*** PopupManager::upate() updating animationCurrentTime: " + currentTime);
+                        }
                         _animationCurrentTime = currentTime;
                         
@@ -353 +365 @@
                                 setInitialBounds(fullBounds.clone());
                                 _initialBounds.getTopLeft().setY(_initialBounds.getTopLeft().getY() + _initialBounds.getSize().height); 
+                                //System.out.println("**** PopupManager::getAnimateBounds() forcing height to be fullBoundsHeight: ");
                                 _initialBounds.getSize().height = 0;
+                                //_initialBounds.getSize().height = fullBounds.getHeight(); // used to be 0
                         }
                         
@@ -360 +374 @@
                                 percentShown = 1 - percentShown;
                         }
-                        
+                        if (Browser.DEBUG) {
+                                System.out.println("Percentage = " + percentShown + " " + fullBounds);
+                        }
                         return AxisAlignedBoxBounds.lerp(_initialBounds, fullBounds, percentShown);
                 }