1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-14 15:11:13 +02:00

348 Commits

Author SHA1 Message Date
Paul Licameli
fa010f643b Fix #include paths, and unnecessary redrawing 2017-07-11 14:17:06 -04:00
Paul Licameli
b11c3c8ccf Highlighting of Wave and Note track vertical rulers 2017-07-11 13:57:59 -04:00
Paul Licameli
ed4057ae1b Highlighting of cutlines and clip boundaries 2017-07-11 13:57:58 -04:00
Paul Licameli
ecebf7656e Highlighting of samples 2017-07-11 13:57:50 -04:00
Paul Licameli
4dcd10584f Fix crashes mousing over TCP 2017-07-10 23:18:33 -04:00
Paul Licameli
44d6d5f427 Highlight MIDI channel buttons 2017-07-09 12:34:46 -04:00
Paul Licameli
f09a7be3dc TCP draw use hit target for button, slider state; remove hacky global 2017-07-09 12:34:27 -04:00
Paul Licameli
8e44827980 TrackPanelCell hit tests can return multiple results...
.. though only the first is used yet
2017-07-09 08:17:40 -04:00
Paul Licameli
b3d62e2ab6 Simplify by removing class HitTestResult...
... Because all hit tests returned all fields blank, or else, returned a
UIHandle object whose Preview method gives the rest of the information; so
the other fields were redundant.
2017-07-09 07:57:34 -04:00
Paul Licameli
c079544667 Defaulting TrackPanel cursor, status message; simplifies other code 2017-07-09 07:57:33 -04:00
Paul Licameli
2c1a16f593 Changed lifetime management of UIHandle objects, no singletons...
... Rather, construct them during hit tests (also capturing more state sooner
rather than at Click time, and adding some accessors for later use)

This also fixes bug 1677 by other means and avoids similar problems.

A cell may be implemented to re-use a previously hit handle object, not yet
clicked, in a later hit test, by remembering a weak pointer, but TrackPanel
holds the strong pointers that determine when the object is destroyed.

And the objects will surely be destroyed after drag-release, or ESC key.

For now they are also destroyed whenever not dragging, and hit-testing is
re-invoked; that will be changed later, so that the re-use mentioned above
becomes effective, but still they will be destroyed when the pointer moves
from one cell to another.
2017-07-09 07:23:28 -04:00
Paul Licameli
d2fbca83b2 All UIHandle::Preview() return same cursors, messages as HitTest...
... except TrackSelectHandle.  Cursor changes to a hand only after button-down.

HitTests give a UIHandle, whenever they also give any cursor or status, even
when it's unsafe to click and drag; Click override is reponsible for cancelling.

SelectHandle::Preview introduces much duplication, but the original in the hit
test will later be deleted.
2017-07-09 06:38:56 -04:00
Paul Licameli
3a8280c562 Distinguish TrackPanelMouseState from TrackPanelMouseEvent...
... Let cell hit tests, and handle preview, know states only, not transitions.

Cell hit tests are passed a mouse state that does not always match the current,
but anticipates the button click to come; usually left, but if the Control
[sic] key on Mac is down, then right.

Thus, pressing and releasing Mac Control in multi-tool switches in and out of
the magnifier cursor.
2017-07-09 06:38:55 -04:00
Paul Licameli
c1f667f170 Move some handle and cell classes into their own files 2017-07-09 06:38:54 -04:00
Pokechu22
b46abbec62 Keep the current note centered when holding control to zoom 2017-07-04 06:45:21 -04:00
Pokechu22
e7065d9e86 Fix note track status message
'verticaly' isn't a word; it's better to just completely reuse the wave track message.
2017-07-03 18:26:25 -04:00
Pokechu22
b7d6077af5 Implement Shift+Right-click for full extent on the note track VRuler 2017-07-03 18:25:13 -04:00
Pokechu22
0e21143cee Implement scrolling for the note track vertical ruler
Command zooms in/out, and shift moves up and down.
2017-07-03 14:23:13 -04:00
James Crook
dc1193a0af Split lines now only show over middle third of track height.
This allows selection and clicking on split lines to merge clips to act independently.  It also means we don't need a portmanteau explanation in the status line, and the action to select up to a split line is simpler and easier to explain.
2017-06-29 17:04:59 +01:00
Gale Andrews
138c188fb4 Message now says merge to match with Undo History 2017-06-29 01:31:29 +01:00
James Crook
2f3530e1f8 Fix verbosity in status message. 2017-06-29 00:00:50 +01:00
Gale Andrews
17b705f2d8 Status bar help for selecting from a split line
Any ideas for shortening the new message welcome. Sometime, status bar messages want transforming to sentence case as intended.
2017-06-28 17:50:20 +01:00
David Bailes
d8930f00b5 Fix Windows build - simple fix 2017-06-28 09:57:00 +01:00
Paul Licameli
6684c7b9b0 More careful use of weak pointers to tracks in UIHandles 2017-06-28 01:46:59 -04:00
Paul Licameli
b0c6a67c33 TrackPanelMouseEvent stores shared_ptr to cell; some handles too...
... those handles that force a simulated button-up when play interrupts drag,
and can assume that pointers to tracks remain nonNULL and part of the current
project state (not the undo history).

Also pass shared_ptr to Track into more hit test routines.
2017-06-28 01:46:56 -04:00
Paul Licameli
708d84ac22 CommonTrackPanelCell::FindTrack returns shared_ptr 2017-06-27 23:09:35 -04:00
Paul Licameli
bce3571372 Redo hit test priorities in TrackPanel...
Zoom tool takes precedence;

Otherwise do special hits appropriate to the track subclass -- and only
WaveTrack here uses Tools toolbar state, and now disallows clicks on things
when they are not drawn because the view is spectrogram;

Finally, default to right button zooming in Multi tool, or to time shift in
that tool, or to selection adjustment in Multi or in Select tool.
2017-06-27 08:26:07 -04:00
Paul Licameli
9e0010ec5f Time track editing requires click on the curve in multi tool...
... and it will also work so, later, in all tools besides Zoom.
2017-06-27 08:26:07 -04:00
Paul Licameli
58fea6d520 null check uses of CommonTrackPanelCell::FindTrack 2017-06-26 16:39:14 -04:00
Paul Licameli
35ce499ce1 Manage TrackControls and TrackVRulerControls by shared_ptr; ...
... they are not singletons; and the back-pointers to their Tracks are weak.
2017-06-26 16:34:10 -04:00
Paul Licameli
fa5a742e22 weak_ptr not events to avoid dangling track pointers in UIHandles 2017-06-25 13:35:15 -04:00
Paul Licameli
d37de4a96c Bug1665: Pan, Gain, Velocity were unresponsive except on last track 2017-06-22 13:42:59 -04:00
Paul Licameli
24dbf989ad Bug1667: fix right-click on vertical ruler, waveform views 2017-06-22 11:26:28 -04:00
Paul Licameli
c1612d6842 Fix WaveTrack menu (ID collision, item names, enabling) 2017-06-15 11:02:28 -04:00
Paul Licameli
770b3b52ef TrackPanel no longer implements the selection tool or MIDI stretch...
This one's big!

Also restores the effect of ctrl-click on label track.

Also adds ESC key handling for the Stretch.
2017-06-15 08:54:59 -04:00
Paul Licameli
46b97084eb Move note track control panel click handling out of TrackPanel.cpp 2017-06-15 08:54:55 -04:00
Paul Licameli
91e6239eeb Move code for vertical ruler clicks, drags, popup menus, scroll wheel 2017-06-15 08:21:40 -04:00
Paul Licameli
a313bcdb11 Move code for Wave track menu items 2017-06-15 08:21:40 -04:00
Paul Licameli
ba5f6ce411 Move code for Note track menu items 2017-06-15 08:21:39 -04:00
Paul Licameli
1a317af2f5 Move code for handling the menu button out of TrackPanel, but...
... Still to do, move out the code for menu items.  They remain accessible
from Shift-M but not from the menu button.

And ESC key is now implemented.
2017-06-15 08:21:36 -04:00
Paul Licameli
7cab380192 TrackPanel still draws Velocity, but no longer handles clicks on it...
... also implemented ESC key for that drag
2017-06-15 08:21:35 -04:00
Paul Licameli
a569476e79 TrackPanel still draws Gain and Pan, but no longer handles clicks on them...
... also implemented ESC key for those drags
2017-06-15 08:21:35 -04:00
Paul Licameli
5ee73f944d TrackPanel still draws Mute and Solo, but no longer handles clicks on them...
... also implemented ESC key for those drags
2017-06-15 08:21:34 -04:00
Paul Licameli
43968c4ac9 TrackPanel no longer implements clip joining or cutline expansion/deletion...
... also implement ESC key for these and added status bar message for
mouse-over
2017-06-15 08:21:30 -04:00
Paul Licameli
2496b0d7bc TrackPanel no longer implements the envelope tool...
... also implement ESC key for it
2017-06-15 08:21:02 -04:00
Paul Licameli
251976d93d TrackPanel no longer implements the time shift tool...
... also implement ESC key for it
2017-06-15 08:21:01 -04:00
Paul Licameli
f1f254f974 TrackPanel no longer implements the draw tool...
... also implement ESC key for it
2017-06-15 08:21:00 -04:00
Paul Licameli
14d45eda33 Define and use the UIHandle and TrackPanelCell protocols, but...
...no actions reimplemented to them yet.

Later commits will move special cases one at a time from TrackPanel, preserving
all click and drag capabilities at each step.  With a few exceptions, but those
lost abilities are restored in yet later commits.  (Ctrl+Click on the Label
track being one.)
2017-06-15 08:20:56 -04:00