1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-14 17:14:07 +01:00
Commit Graph

774 Commits

Author SHA1 Message Date
Paul Licameli
f5b0afc2fc Rename TrackPanel::HandleCursor as HandleMotion...
Call HitTest in just one place

Can now preserve repeatedly hit UIHandle objects during pre-click motion

Fields of HitTestResult besides the handle pointer are now unused

The need to repaint a track during mouse movement can be indicated when
constructing a UIHandle or when updating it for move; HitPreview no longer
does this

And the last allows simplifications of LabelTrack glyph highlighting

Also move the temporary state for label glyph dragging out of LabelTrack
2017-07-09 07:56:47 -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
James Crook
d903845a6b Bug 1677 - Residual. Handle ESC during track rearrangement. 2017-07-04 21:21:24 +01:00
James Crook
9ab40113b7 Bug 1677 - Swap two tracks leads to crash on exit. 2017-07-04 11:56:06 +01: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
aa8be0c413 Make it easier to start a new selection at a split line.
If you hover exactly above the split line, you now get a pointing hand icon and status message, allowing you to start a selection at the split line more easily.
2017-06-30 13:17:21 +01:00
Paul Licameli
8f50940b91 Restore turning-off highlighting label glyph when mouse leaves it...
But inelegantly!

It was broken at commit 828d9c3ccd

Nicer solutions in progres...
2017-06-30 00:14:41 -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
Paul Licameli
f3e31eca8b Simplify SelectHandle ctor; make frequency snapping functions static 2017-06-28 21:44:19 -04: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
e2f0a16839 TrackButtonHandle keeps weak_ptr to the cell 2017-06-28 01:46:58 -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
b3208ab12d Restore status message "Click and drag to select audio" 2017-06-27 22:35:19 -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
24ebf27bb6 Cursor change and status message for mouse over label text boxes 2017-06-27 08:16:09 -04:00
Paul Licameli
828d9c3ccd Simplify label track hit tests 2017-06-27 08:16:09 -04:00
James Crook
6dc52c3d7a Fix Windows build. 2017-06-26 22:47:38 +01:00
Paul Licameli
f8b74db76e Iterators over TrackPanelCell give shared_ptr 2017-06-26 17:14:33 -04:00
Paul Licameli
58fea6d520 null check uses of CommonTrackPanelCell::FindTrack 2017-06-26 16:39:14 -04:00
Paul Licameli
28b40e02fb Manage TrackPanelResizerCell by shared_ptr, no singleton 2017-06-26 16:39:07 -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
ffbc4d5f90 Simplify iterations over TrackPanelCells with range-for 2017-06-17 03:01:40 -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
efdb9889b1 TrackPanel no longer implements label keystrokes, drags, text selection...
... also implemented ESC key for those drags

... temporarily loses the special CTRL click handling
2017-06-15 08:54:58 -04:00
Paul Licameli
703abe87bc TrackPanel no longer implements track selection click or rearrange drag...
... also implement ESC key for the drag
2017-06-15 08:54:57 -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
e4627b1668 TrackPanel no longer implements other mouse wheel actions 2017-06-15 08:21:42 -04:00
Paul Licameli
8ef5f696d8 Define BackgoundCell, move some things into it 2017-06-15 08:21:41 -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
01d5d30b7e Move code for Label track menu items 2017-06-15 08:21:38 -04:00
Paul Licameli
516d812f3a Move code for Time track menu items 2017-06-15 08:21:38 -04:00
Paul Licameli
0e5e7b1c05 Move code for common track menu items 2017-06-15 08:21:37 -04:00