Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 09:39:42 +02:00
Code Issues Releases Wiki Activity

Rewrite time ruler reusing CellularPanel; ESC aborts drags in it...

Browse Source 
... And some improvement in prompt showing and hiding of the quick-play
guide line
This commit is contained in:
Paul Licameli 2018-08-04 16:11:48 -04:00
commit bf82eaa4c6
4 changed files with 590 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tracks/ui/Scrubbing.cpp
View File

@ -184,8 +184,7 @@ void Scrubber::ScrubPoller::Notify()
}
Scrubber::Scrubber(AudacityProject *project)
: mInOneShotMode( false )
, mScrubToken(-1)
: mScrubToken(-1)
, mPaused(true)
, mScrubSpeedDisplayCountdown(0)
, mScrubStartPosition(-1)
@ -891,7 +890,7 @@ void ScrubbingOverlay::OnTimer(wxCommandEvent &event)
{
if(scrubber.HasMark()) {
auto xx = ruler->ScreenToClient(position).x;
ruler->UpdateQuickPlayPos(xx);
ruler->UpdateQuickPlayPos( xx, false );
if (!isScrubbing)
// Really start scrub if motion is far enough

3
src/tracks/ui/Scrubbing.h
View File

@ -152,9 +152,6 @@ public:
void Pause(bool paused);
bool IsPaused() const;
void CheckMenuItems();
// Bug 1508
bool IsOneShotSeeking()const { return mInOneShotMode && IsScrubbing();};
bool mInOneShotMode;
private:
void DoScrub(bool seek);

894
src/widgets/Ruler.cpp
View File

File diff suppressed because it is too large Load Diff

75
src/widgets/Ruler.h
View File

@ -11,7 +11,7 @@
#ifndef __AUDACITY_RULER__
#define __AUDACITY_RULER__
#include "OverlayPanel.h"
#include "../CellularPanel.h"
#include "../MemoryX.h"
#include <wx/bitmap.h>
#include <wx/dc.h>
@ -310,7 +310,7 @@ private:
};
// This is an Audacity Specific ruler panel.
class AUDACITY_DLL_API AdornedRulerPanel final : public OverlayPanel
class AUDACITY_DLL_API AdornedRulerPanel final : public CellularPanel
{
public:
AdornedRulerPanel(AudacityProject *project,
@ -322,10 +322,6 @@ public:
~AdornedRulerPanel();
bool AcceptsFocus() const override { return s_AcceptsFocus; }
bool AcceptsFocusFromKeyboard() const override { return true; }
void SetFocusFromKbd() override;
public:
int GetRulerHeight() { return GetRulerHeight(mShowScrubbing); }
static int GetRulerHeight(bool showScrubBar);
@ -346,16 +342,9 @@ public:
void UpdatePrefs();
void ReCreateButtons();
enum class StatusChoice {
EnteringQP,
EnteringScrubZone,
Leaving,
NoChange
};
void RegenerateTooltips();
void RegenerateTooltips(StatusChoice choice);
void UpdateQuickPlayPos(wxCoord &mousPosX);
void UpdateQuickPlayPos(wxCoord &mousePosX, bool shiftDown);
bool ShowingScrubRuler() const { return mShowScrubbing; }
void OnToggleScrubRuler(/*wxCommandEvent& */);
@ -370,16 +359,11 @@ private:
void OnPaint(wxPaintEvent &evt);
void OnSize(wxSizeEvent &evt);
void UpdateRects();
void OnMouseEvents(wxMouseEvent &evt);
void HandleQPClick(wxMouseEvent &event, wxCoord mousePosX);
void HandleQPDrag(wxMouseEvent &event, wxCoord mousePosX);
void HandleQPRelease(wxMouseEvent &event);
void StartQPPlay(bool looped, bool cutPreview);
void UpdateStatusBarAndTooltips(StatusChoice choice);
void OnCaptureLost(wxMouseCaptureLostEvent &evt);
void DoDrawBackground(wxDC * dc);
void DoDrawEdge(wxDC *dc);
void DoDrawMarks(wxDC * dc, bool /*text */ );
@ -389,14 +373,6 @@ public:
void DoDrawIndicator(wxDC * dc, wxCoord xx, bool playing, int width, bool scrub, bool seek);
void UpdateButtonStates();
private:
static bool s_AcceptsFocus;
struct Resetter { void operator () (bool *p) const { if(p) *p = false; } };
using TempAllowFocus = std::unique_ptr<bool, Resetter>;
public:
static TempAllowFocus TemporarilyAllowFocus();
private:
void DoDrawPlayRegion(wxDC * dc);
@ -410,14 +386,8 @@ private:
private:
wxCursor mCursorDefault;
wxCursor mCursorHand;
wxCursor mCursorSizeWE;
bool mIsWE;
Ruler mRuler;
AudacityProject *const mProject;
ViewInfo *const mViewInfo;
TrackList *mTracks;
wxRect mOuter;
@ -431,7 +401,6 @@ private:
double mQuickPlayPosUnsnapped;
double mQuickPlayPos;
std::unique_ptr<SnapManager> mSnapManager;
bool mIsSnapped;
bool mPlayRegionLock;
@ -455,8 +424,6 @@ private:
void OnAutoScroll(wxCommandEvent &evt);
void OnLockPlayRegion(wxCommandEvent &evt);
void OnContextMenu(wxContextMenuEvent & WXUNUSED(event));
void OnTogglePinnedState(wxCommandEvent & event);
bool mPlayRegionDragsSelection;
@ -474,11 +441,8 @@ private:
MouseEventState mMouseEventState;
double mLeftDownClickUnsnapped; // click position in seconds, before snap
double mLeftDownClick; // click position in seconds
int mLastMouseX; // Pixel position
bool mIsDragging;
StatusChoice mPrevZone { StatusChoice::NoChange };
bool mShowScrubbing { false };
DECLARE_EVENT_TABLE()
@ -486,11 +450,42 @@ private:
wxWindow *mButtons[3];
bool mNeedButtonUpdate { true };
//
// CellularPanel implementation
//
FoundCell FindCell(int mouseX, int mouseY) override;
wxRect FindRect(const TrackPanelCell &cell) override;
public:
AudacityProject * GetProject() const override;
private:
TrackPanelCell *GetFocusedCell() override;
void SetFocusedCell() override;
void ProcessUIHandleResult
(TrackPanelCell *pClickedTrack, TrackPanelCell *pLatestCell,
unsigned refreshResult) override;
void UpdateStatusMessage( const wxString & ) override;
void CreateOverlays();
// Cooperating objects
class QuickPlayIndicatorOverlay;
std::unique_ptr<QuickPlayIndicatorOverlay> mOverlay;
class QuickPlayRulerOverlay;
private:
class CommonRulerHandle;
class QPHandle;
class ScrubbingHandle;
class CommonCell;
class QPCell;
std::shared_ptr<QPCell> mQPCell;
class ScrubbingCell;
std::shared_ptr<ScrubbingCell> mScrubbingCell;
};
#endif //define __AUDACITY_RULER__