Paul Licameli
b30093a606
Fix the bounce in play indicator when drag selection snaps to zero width...
...
... This problem was introduced at 3dec7153a30ce58d23e42d122362cd6f86c37ca8.
Also fix the mistake of painting to the wrong dc in some new code.
2016-04-30 09:47:09 -04:00
Paul Licameli
009884575c
Revert "Show the hand cursor in the ruler only if quick play is enabled."
...
This reverts commit 3532bc227c09a53c7f394654203f88f2b5e90130.
2016-04-29 14:47:59 -04:00
Gale Andrews
df3003fe62
Use same term as used in the Manual.
2016-04-29 16:09:18 +01:00
Paul Licameli
3532bc227c
Show the hand cursor in the ruler only if quick play is enabled.
2016-04-29 10:58:46 -04:00
Paul Licameli
adbe221920
Small improvement to drawing of the play region in the time ruler...
...
... that's the gray double headed arrow (or red, when locked).
When the arrowheads overlap, don't draw any shaft.
2016-04-28 17:48:34 -04:00
Paul Licameli
a5b7b3a45e
Define a wxFileNameWrapper that does not crash GCC 5.0. Thanks, Max Kellermann.
2016-04-28 13:17:07 -04:00
Gale Andrews
5c02e01e48
Add help for Xcode 7.2 or later.
2016-04-28 17:12:08 +01:00
Paul Licameli
3fcb8b4f44
Merge branch 'scrubbing'
...
* scrubbing:
Fix play button appearance during timeline quick play
2016-04-28 06:25:56 -04:00
Paul Licameli
7c8398fafd
Fix play button appearance during timeline quick play
2016-04-28 06:25:20 -04:00
Paul Licameli
a8d85585cf
Merge branch 'master' into scrubbing
2016-04-28 06:25:06 -04:00
Paul Licameli
e09f620311
Wrote (did not enable) an alternative wxFileNameWrapper::swap
2016-04-28 05:04:34 -04:00
Max Kellermann
8ef83759a7
Track: disable TrackList::Add<NoteTrack> if MIDI support is disabled
...
Fixes build failure when configured with --without-midi.
2016-04-28 04:40:01 -04:00
Paul Licameli
1b4d198b69
More scrub phase 2 improvements...
...
Context menu for scrub head shows checkmarks, and is available during scrub
Enable scrubbing only when the scrub bar shows
2016-04-27 20:57:24 -04:00
Paul Licameli
042d6801df
Context menu for scrub head shows checkmarks, and is available during scrub
2016-04-27 20:56:38 -04:00
Paul Licameli
d1d0ea022f
Merge branch 'master' into scrubbing2
2016-04-27 20:37:39 -04:00
Paul Licameli
1509ff0621
Conditional compilation flag can disabled the checkmarks in scrub sub menu
2016-04-27 20:36:32 -04:00
Paul Licameli
cc9b880852
Conditional compilation flag can disabled the checkmarks in scrub sub menu
2016-04-27 20:35:32 -04:00
Paul Licameli
adf4649f03
Enable scrubbing only when the scrub bar shows
2016-04-27 19:06:55 -04:00
Paul Licameli
3b954bb2d1
Implement showing and hiding of a srub bar portion of the ruler...
2016-04-27 18:41:31 -04:00
Paul Licameli
5a5775c1c1
Implement showing and hiding of a srub bar portion of the ruler...
...
... activated by clicking near the left end of the ruler, then using the
context menu.
This is not finished work, but a proof of concept for a possible new scrubbing
UI.
2016-04-27 18:39:47 -04:00
Paul Licameli
b7dc2561b6
Merge branch 'master' into scrubbing2
2016-04-27 18:36:10 -04:00
Paul Licameli
68eda0f802
Cursor line in the ruler should always follow that in TrackPanel, as after "j"
2016-04-27 17:48:55 -04:00
Paul Licameli
5086260a60
fix build
2016-04-27 17:45:53 -04:00
Paul Licameli
bf6abc8f6c
Merge branch 'scrubbing'
...
* scrubbing:
Draw the play or record head in the ruler in their former sizes.
2016-04-27 12:42:48 -04:00
Paul Licameli
926dfb7253
Draw the play or record head in the ruler in their former sizes.
2016-04-27 12:41:49 -04:00
Paul Licameli
0e31c23c98
Change transport toolbar image for scrubbing. Darker outline.
2016-04-27 11:54:22 -04:00
Paul Licameli
85e7bf670d
Change transport toolbar image for scrubbing. Darker outline.
2016-04-27 11:50:43 -04:00
Paul Licameli
d8fd3dd09b
Merge branch 'master' into scrubbing
2016-04-27 11:50:27 -04:00
Paul Licameli
5474ff752d
Fix compilation of EXPERIMENTAL_THEMING
2016-04-27 10:49:19 -04:00
Paul Licameli
3154b78b0f
Fix assertions and crashes in context menu for scrubber
2016-04-26 15:38:27 -04:00
Paul Licameli
6a1d387093
Fix assertions and crashes in context menu for scrubber
2016-04-26 15:37:55 -04:00
Paul Licameli
d0a8e33e1c
Scrubbing Phase 2 -- (left or right or double) click the play head in the ruler
2016-04-26 12:17:50 -04:00
Paul Licameli
9ab0e42f29
Control scrub with motion, click, drag, wheel almost anywhere in main window...
...
... if the event is not handled and skipped by sub-windows first, such as for
toolbar button clicks.
(But track panel clicks are skipped even after doing something, so they may
also cause seeking besides other responses. So click can seek AND set cursor.)
This is meant to make drag to seek and wheel for change of speed easier,
without needing to keep the mouse in the narrow time ruler.
Also lets you click in the ruler, then move in any direction, and not miss the
motion event that should start the scrub playback.
The event handling is a bit of a hack, using propagation. It does not use
capture.
2016-04-26 12:12:06 -04:00
Paul Licameli
3d222bcd87
Context menu for scrubbing in the ruler
2016-04-26 12:12:06 -04:00
Paul Licameli
c12993a53b
Simplify with more uses of HideQuickPlayIndicator()
2016-04-26 12:12:06 -04:00
Paul Licameli
cd57e0a26c
Scrubbing phase 2. Scrub starts with click on the indicator in the ruler...
...
... and works in any of the six tools.
Click and drag in select tool during scrub works just as when not scrubbing.
Seeks now only if you left-click or drag in the ruler, but this may change.
Mouse motion anywhere on the screen controls scrub as before.
No mouse clicks in TrackPanel are used by scrubbing.
The Ctrl-Click in TrackPanel is now unused. Should 2.1.0 behavior be restored?
That was click to quick play, redundant with click in the (lower part of) the
ruler.
2016-04-26 12:12:06 -04:00
Paul Licameli
4deb90c633
ESC leaves scrubbing even when clicked only; disable scrub menu items when...
2016-04-26 09:04:02 -04:00
Paul Licameli
b0d2f38786
ESC leaves scrubbing even when clicked only; disable scrub menu items when...
...
... another project is playing
2016-04-26 09:02:38 -04:00
Paul Licameli
765799660f
Update the status bar message as left button switches in an out of seeking.
2016-04-25 16:05:30 -04:00
Paul Licameli
6d2528ae10
Update the status bar message as left button switches in an out of seeking.
2016-04-25 16:04:24 -04:00
Paul Licameli
d6e7796aa0
When changing the scrub mode via menu command or shortcut, update status bar
2016-04-25 15:44:02 -04:00
Paul Licameli
a57ef7a560
When changing the scrub mode via menu command or shortcut, update status bar
2016-04-25 15:43:26 -04:00
Paul Licameli
5be4f60a4e
Merge branch 'master' into scrubbing
2016-04-25 15:32:02 -04:00
Gale Andrews
aab32215ca
Best not to use "g" for access keys
...
because the tail of the "g" obscures the underline
2016-04-25 17:24:37 +01:00
Paul Licameli
db4041e741
Change drawing of quick play indicator. It can be green for scrubbing...
...
Hide quick play indicator when other playback starts...
2016-04-25 12:20:37 -04:00
Paul Licameli
ea0274b5fa
Change drawing of quick play indicator. It can be green for scrubbing...
...
... But this isn't used yet. Also make the scrub head bigger.
2016-04-25 12:19:47 -04:00
Paul Licameli
0071db6f53
Hide quick play indicator when other playback starts...
...
... but it can reappear when mouse moves. You may still select a quick play
region during play, to jump playback.
2016-04-25 12:00:58 -04:00
Paul Licameli
8b2729f4a2
Merge branch 'master' into scrubbing
2016-04-25 12:00:29 -04:00
Paul Licameli
d34715d6ad
Various other drags could crash Mac debug build if you option-W. Fixed too...
...
... And I think this fix is now exhaustive.
2016-04-25 01:49:54 -04:00
Paul Licameli
ece29b3ff3
Likewise, don't crash on command-W while dragging in the timeline ruler.
2016-04-25 01:38:07 -04:00