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

Allow NULL arguments in TrackPanel::GetTracksUsableArea()

Browse Source
This commit is contained in:
Paul Licameli 2015-08-21 12:02:48 -04:00
parent e7c7bb84a9
commit a9ab31dedb
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Menus.cpp
View File

@ -4952,8 +4952,8 @@ void AudacityProject::OnZoomFit()
if (len <= 0.0)
return;
int w, h;
mTrackPanel->GetTracksUsableArea(&w, &h);
int w;
mTrackPanel->GetTracksUsableArea(&w, NULL);
w -= 10;
Zoom(w / len);
@ -4962,9 +4962,9 @@ void AudacityProject::OnZoomFit()
void AudacityProject::DoZoomFitV()
{
int width, height, count;
int height, count;
mTrackPanel->GetTracksUsableArea(&width, &height);
mTrackPanel->GetTracksUsableArea(NULL, &height);
height -= 28;

16
src/TrackPanel.cpp
View File

@ -1074,9 +1074,11 @@ void TrackPanel::SelectTrackLength(Track *t)
void TrackPanel::GetTracksUsableArea(int *width, int *height) const
{
GetSize(width, height);
*width -= GetLeftOffset();
*width -= kRightMargin;
*width = std::max(0, *width);
if (width) {
*width -= GetLeftOffset();
*width -= kRightMargin;
*width = std::max(0, *width);
}
}
/// Gets the pointer to the AudacityProject that
@ -4150,8 +4152,8 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
if (mouseTrack == NULL) {
// Allow sliding if the pointer is not over any track, but only if x is
// within the bounds of the tracks area.
int width, height;
GetTracksUsableArea(&width, &height);
int width;
GetTracksUsableArea(&width, NULL);
if (event.m_x >= GetLeftOffset() && event.m_x < GetLeftOffset() + width)
mouseTrack = mCapturedTrack;
else
@ -8254,8 +8256,8 @@ void TrackPanel::ScrollIntoView(double pos)
{
const int screenWidth = rint(mViewInfo->GetScreenWidth());
int w, h;
GetTracksUsableArea( &w, &h );
int w;
GetTracksUsableArea( &w, NULL );
// Or should we just set w = screenWidth ?
int pixel = mViewInfo->TimeToPosition(pos);

1
src/TrackPanel.h
View File

@ -166,6 +166,7 @@ class AUDACITY_DLL_API TrackPanel:public wxPanel {
virtual int GetLeftOffset() const { return GetLabelWidth() + 1;}
// Width and height, relative to upper left corner at (GetLeftOffset(), 0)
// Either argument may be NULL
virtual void GetTracksUsableArea(int *width, int *height) const;
virtual void SelectNone();

4
src/widgets/Ruler.cpp
View File

@ -1936,8 +1936,8 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
// Keep Quick-Play within usable track area.
TrackPanel *tp = mProject->GetTrackPanel();
int mousePosX, width, height;
tp->GetTracksUsableArea(&width, &height);
int mousePosX, width;
tp->GetTracksUsableArea(&width, NULL);
mousePosX = std::max(evt.GetX(), tp->GetLeftOffset());
mousePosX = std::min(mousePosX, tp->GetLeftOffset() + width - 1);