1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-12 15:46:25 +01:00

Bugzilla#109 more intuitive label movement. Now circle moves label, chevron moves edge whilst retaining boundary moving behaviour when labels abut.

This commit is contained in:
james.k.crook
2010-02-07 11:11:35 +00:00
parent 1c3748c79c
commit 5f0a075026
2 changed files with 118 additions and 38 deletions

View File

@@ -47,6 +47,9 @@ public:
void DrawTextBox( wxDC & dc, const wxRect & r);
void DrawHighlight( wxDC & dc, int xPos1, int xPos2, int charHeight);
void getXPos( wxDC & dc, int * xPos1, int cursorPos);
double getDuration(){return t1-t;};
void AdjustEdge( int iEdge, double fNewTime);
void MoveLabel( int iEdge, double fNewTime);
public:
double t; /// Time for left hand of label.
@@ -169,6 +172,9 @@ class LabelTrack:public Track {
bool CalcCursorX(wxWindow * parent, int * x);
int getCurrentCursorPosition() const { return mCurrentCursorPos; };
void MayAdjustLabel( int iLabel, int iEdge, bool bAllowSwapping, double fNewTime);
void MayMoveLabel( int iLabel, int iEdge, double fNewTime);
void ShiftLabelsOnClear(double b, double e);
void ChangeLabelsOnClear(double b, double e);
void ShiftLabelsOnInsert(double length, double pt);
@@ -226,6 +232,7 @@ class LabelTrack:public Track {
void RemoveSelectedText();
bool mIsAdjustingLabel;
bool mbIsMoving;
static wxFont msFont;
};