Changeset 1156 for trunk/src/org/apollo
- Timestamp:
- 09/20/18 14:20:32 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/apollo/widgets/SampledTrack.java
r1154 r1156 41 41 import org.apollo.gui.PlaybackControlPopup; 42 42 import org.apollo.gui.SampledTrackGraphView; 43 import org.apollo.gui.SampledTrackGraphView.EffecientInvalidator; 43 44 import org.apollo.gui.Strokes; 44 import org.apollo.gui.SampledTrackGraphView.EffecientInvalidator;45 45 import org.apollo.io.AudioIO; 46 import org.apollo.io.AudioIO.AudioFileLoader; 46 47 import org.apollo.io.AudioPathManager; 47 48 import org.apollo.io.IconRepository; 48 import org.apollo.io.AudioIO.AudioFileLoader;49 49 import org.apollo.items.EmulatedTextItem; 50 50 import org.apollo.items.EmulatedTextItem.TextChangeListener; … … 77 77 import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException; 78 78 import org.expeditee.items.widgets.Widget; 79 import org.expeditee.taskmanagement.EntitySaveManager;80 79 81 80 /** … … 237 236 fulltrackView.setBackColor(SampledTrackGraphView.DEFAULT_BACKGROUND_COLOR, SampledTrackGraphView.DEFAULT_BACKGROUND_HIGHTLIGHTS_COLOR); 238 237 } 239 240 EntitySaveManager.getInstance().saveAll();241 242 238 } 243 239 … … 307 303 308 304 // Determine where popup should show 309 int x = SampledTrack.this.getX();305 //int x = SampledTrack.this.getX(); 310 306 int y = SampledTrack.this.getY() - playbackControlPopup.getFullBounds().getHeight() - 2; // by default show above 311 307 … … 1442 1438 MouseEvent me = MouseEventRouter.getCurrentMouseEvent(); 1443 1439 1444 if (!i gnoreInjection&& me != null && me != lastInsertME &&1440 if (!isIgnoreInjection() && me != null && me != lastInsertME && 1445 1441 (me.getButton() == MouseEvent.BUTTON2 || 1446 1442 me.getButton() == MouseEvent.BUTTON3)) { … … 1466 1462 } 1467 1463 1468 } else if (!i gnoreInjection&& me == lastInsertME) {1464 } else if (!isIgnoreInjection() && me == lastInsertME) { 1469 1465 // Note due to a injection removing this widget while in the midst of 1470 1466 // anchoring, the widget parent event filtering will not work thus … … 1794 1790 1795 1791 // Anchor it 1796 rightSideTrack. ignoreInjection = true;1792 rightSideTrack.setIgnoreInjection(true); 1797 1793 target.addAllItems(rightSideTrack.getItems()); 1798 rightSideTrack. ignoreInjection = false;1794 rightSideTrack.setIgnoreInjection(false); 1799 1795 1800 1796 // Adjust initiation time to be exact … … 2136 2132 return false; 2137 2133 } 2134 2135 public boolean isIgnoreInjection() { 2136 return ignoreInjection; 2137 } 2138 2139 public void setIgnoreInjection(boolean ignoreInjection) { 2140 this.ignoreInjection = ignoreInjection; 2141 } 2138 2142 }
Note:
See TracChangeset
for help on using the changeset viewer.