Changeset 319

Timestamp:

09/23/08 16:29:29 (16 years ago)

Author:

bjn8

Message:

Fixed lazy layout bug

Location:

trunk/src_apollo/org/apollo/widgets

Files:

• LinkedTrack.java (modified) (9 diffs)
• SampledTrack.java (modified) (1 diff)

trunk/src_apollo/org/apollo/widgets/LinkedTrack.java

@@ -66 +66 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.MessageBay;
 import org.expeditee.gui.MouseEventRouter;
 import org.expeditee.gui.PopupManager;
@@ -655 +656 @@
                                                 link,
                                                 getName());
+                                
+                                
+                                // Wakeup the daemon to note that it should recheck -- in the case that a track is
+                                // added to a non-overdubbed frame the audio structure model will not bother
+                                // adding the track until something requests for it.
+                                FrameLayoutDaemon.getInstance().forceRecheck();
                         }
                         
@@ -704 +711 @@
                                         FrameGraphics.refresh(true);
                                 }
-                        });
+                        }); // NOTE TO REPEAT: Pick up a linked track and delete it directly from freespace
 
                 case ItemParentStateChangedEvent.EVENT_TYPE_REMOVED_VIA_OVERLAY: // TODO revise - and in sampled track widget
@@ -713 +720 @@
                         MultiTrackPlaybackController.getInstance().removeObserver(this);
                         masterMix.removeObserver(this);
-                        
                         
                         setState(NOT_INITIALIZED);
@@ -775 +781 @@
                 setState(LOADING_TRACK_GRAPH);
 
-                //FrameLayoutDaemon.getInstance().forceRecheck(); // no need - daemon is notified via structure model
-
-                
         }
 
@@ -898 +901 @@
         
                                 }
-                                
-        
+
                         }
                         
@@ -909 +911 @@
                         }
 
-                        
                         if (abortMessage != null) {
-                                
-                                
-                                
-                                
-                                
-                                // TODO!!
-                                // Draw string...
-                                
-                                
-                                
-                                
-                                
+                                String name = getName();
+                                if (name == null) name = "Unamed";
+                                MessageBay.errorMessage(name + " linked track: " + abortMessage);
                         }
                         
@@ -943 +935 @@
                                 
                                 // Draw selection start bar
-        
                                 ((Graphics2D)g).setStroke(SampledTrackGraphView.GRAPH_BAR_STROKE);
                                 
@@ -1054 +1045 @@
                 g.setFont(HELPER_FONT);
                 g.drawString(helperMessage, xoff, yoff);
+
         }
         

trunk/src_apollo/org/apollo/widgets/SampledTrack.java

@@ -1350 +1350 @@
                                                 removeSelf();
                                         }
+                                        
+                                        // Wakeup the daemon to note that it should recheck -- in the case that a track is
+                                        // added to a non-overdubbed frame the audio structure model will not bother
+                                        // adding the track until something requests for it.
+                                        FrameLayoutDaemon.getInstance().forceRecheck();
                                 }