Changeset 1142 for trunk/src/org/apollo
- Timestamp:
- 09/18/18 11:57:32 (6 years ago)
- Location:
- trunk/src/org/apollo
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/apollo/ApolloGestureActions.java
r1098 r1142 170 170 for (Item i : current.getItems()) { 171 171 Point pos = i.getPosition(); 172 pos. x %= windowSize.width;173 pos. y %= windowSize.height;172 pos.setX(pos.getX() % windowSize.width); 173 pos.setY(pos.getY() % windowSize.height); 174 174 i.setPosition(pos); 175 175 } -
trunk/src/org/apollo/audio/structure/AudioStructureModel.java
r1102 r1142 347 347 if (localFileName != null) { 348 348 tracks.put(localFileName, new TrackModelData( 349 initiationTime, -1, name, result.position. y)); // pass -1 for running time to signify that must be read from audio file349 initiationTime, -1, name, result.position.getY())); // pass -1 for running time to signify that must be read from audio file 350 350 } 351 351 … … 389 389 if (virtualFilename != null) { 390 390 linkedTracks.put(virtualFilename, new LinkedTrackModelData( 391 initiationTime, result.explink, name, result.position. y)); // pass -1 for running time to signify that must be read from audio file391 initiationTime, result.explink, name, result.position.getY())); // pass -1 for running time to signify that must be read from audio file 392 392 } 393 393 -
trunk/src/org/apollo/gui/FrameLayoutDaemon.java
r1102 r1142 562 562 int offsetX = width / 2; 563 563 int offsetY = freespaceTrackToFormat.getHeight() / 2; 564 freespaceTrackToFormat.setPosition(containerPoint. x - offsetX, containerPoint.y- offsetY);564 freespaceTrackToFormat.setPosition(containerPoint.getX() - offsetX, containerPoint.getY() - offsetY); 565 565 StandardGestureActions.resetOffset(); 566 566 } -
trunk/src/org/apollo/io/SampledAudioFileImporter.java
r1102 r1142 25 25 f, 26 26 DisplayController.getCurrentFrame(), 27 location. x,28 location. y);27 location.getX(), 28 location.getY()); 29 29 30 30 // Add the sampled track widget to the current frame -
trunk/src/org/apollo/items/EmulatedTextItem.java
r1125 r1142 97 97 Point p = EcosystemManager.getInputManager().getCursorPosition(); 98 98 99 return isOnEmulatedText(p. x, p.y);99 return isOnEmulatedText(p.getX(), p.getY()); 100 100 } 101 101 … … 134 134 135 135 // If so and the event really comes from its parent ... 136 if (isOnEmulatedText(p. x, p.y)) {136 if (isOnEmulatedText(p.getX(), p.getY())) { 137 137 138 138 int yOffset = -6; … … 154 154 { 155 155 // Insert the text according to the current mouse position 156 Point newMouse = emulatedSource.insertChar(e.getKeyChar(), p. x, p.y);156 Point newMouse = emulatedSource.insertChar(e.getKeyChar(), p.getX(), p.getY()); 157 157 158 158 List<String> lines = emulatedSource.getTextList(); … … 166 166 // Move "cursored mouse" 167 167 if (newMouse != null) { 168 EcosystemManager.getInputManager().setCursorPosition(new Point((int) newMouse. x, (int) newMouse.y+ yOffset));168 EcosystemManager.getInputManager().setCursorPosition(new Point((int) newMouse.getX(), (int) newMouse.getY() + yOffset)); 169 169 } 170 170 } … … 193 193 194 194 // If so and the event really comes from its parent ... 195 if (isOnEmulatedText(p. x, p.y)) {195 if (isOnEmulatedText(p.getX(), p.getY())) { 196 196 197 197 int yOffset = -6; … … 207 207 208 208 if (newMouse != null) { 209 EcosystemManager.getInputManager().setCursorPosition(new Point((int) newMouse. x, (int) newMouse.y+ yOffset));209 EcosystemManager.getInputManager().setCursorPosition(new Point((int) newMouse.getX(), (int) newMouse.getY() + yOffset)); 210 210 } 211 211 … … 241 241 242 242 // If so and the event really comes from its parent ... 243 if (isOnEmulatedText(p. x, p.y)) {243 if (isOnEmulatedText(p.getX(), p.getY())) { 244 244 245 245 String toMoveIntoFreespace = null; … … 267 267 if (target != null) { 268 268 Text selectionCopy = new Text(target.getNextItemID(), toMoveIntoFreespace); 269 selectionCopy.setPosition(p. x, p.y);269 selectionCopy.setPosition(p.getX(), p.getY()); 270 270 selectionCopy.setSize(emulatedSource.getSize()); 271 271 StandardGestureActions.pickup(selectionCopy); … … 290 290 291 291 // If so and the event really comes from its parent ... 292 if (isOnEmulatedText(p. x, p.y)) {292 if (isOnEmulatedText(p.getX(), p.getY())) { 293 293 294 294 emulatedSource.clearSelection(); 295 emulatedSource.setSelectionStart(p. x, p.y, e.getButton());295 emulatedSource.setSelectionStart(p.getX(), p.getY(), e.getButton()); 296 296 297 297 repaint(); … … 313 313 314 314 // If so and the event really comes from its parent ... 315 if (isOnEmulatedText(p. x, p.y)) {315 if (isOnEmulatedText(p.getX(), p.getY())) { 316 316 317 317 EcosystemManager.getGraphicsManager().setCursor(new Cursor(Cursor.CursorType.TEXT)); 318 318 319 emulatedSource.setSelectionEnd(p. x, p.y);319 emulatedSource.setSelectionEnd(p.getX(), p.getY()); 320 320 repaint(); 321 321 -
trunk/src/org/apollo/widgets/LinkedTrack.java
r1102 r1142 1814 1814 if (y < 0) { 1815 1815 y = LinkedTrack.this.getY() + LinkedTrack.this.getHeight() + 2; 1816 animationSource.getTopLeft(). y = y - 2;1816 animationSource.getTopLeft().setY(y - 2); 1817 1817 } 1818 1818 -
trunk/src/org/apollo/widgets/SampledTrack.java
r1102 r1142 1274 1274 ((Graphics2D)g).setStroke(EditableSampledTrackGraphView.GRAPH_BAR_STROKE); 1275 1275 g.drawLine( 1276 containerPoint. x+ me.getX(),1277 containerPoint. y,1278 containerPoint. x+ me.getX(),1279 containerPoint. y+ me.getComponent().getHeight());1276 containerPoint.getX() + me.getX(), 1277 containerPoint.getY(), 1278 containerPoint.getX() + me.getX(), 1279 containerPoint.getY() + me.getComponent().getHeight()); 1280 1280 1281 1281 DisplayController.invalidateArea(new AxisAlignedBoxBounds( 1282 containerPoint. x+ me.getX(),1283 containerPoint. y,1282 containerPoint.getX() + me.getX(), 1283 containerPoint.getY(), 1284 1284 1, 1285 containerPoint. y+ me.getComponent().getHeight() + 1));1285 containerPoint.getY() + me.getComponent().getHeight() + 1)); 1286 1286 1287 1287 // Restore clip
Note:
See TracChangeset
for help on using the changeset viewer.