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

(Sync-Lock)

Browse Source 
Fixed bug Martyn noticed, where clicking on the sync-lock icon caused the track to (un)minimize. This was because TrackInfo::GetMinimizeRect() was still returning the full size, which I had just adjusted in TrackInfo::DrawMinimize(), so the capture test in other places was wrong. Moved the size adjustment into TrackInfo::GetMinimizeRect(). 

Also got rid of unused bool minimized parameters of TrackInfo::GetMinimizeRect() and TrackInfo::DrawMinimize(). It wasn't used at all in TrackInfo::GetMinimizeRect(), so I replaced it with bIsSyncLockSelected, so it can determine whether to reduce the width to give room for the sync-lock icon. For TrackInfo::DrawMinimize(), it was unnecessary, because the track was also getting passed in, so no need to call t->GetMinimized() in every call to DrawMinimize() -- just call it within DrawMinimize().
This commit is contained in:
v.audacity 2010-08-25 22:34:17 +00:00
parent 17832cf2f5
commit 536af8ad52
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/TrackPanel.cpp
View File

@ -3583,12 +3583,12 @@ void TrackPanel::HandleMinimizing(wxMouseEvent & event)
}
wxRect buttonRect;
mTrackInfo.GetMinimizeRect(r, buttonRect, t->GetMinimized());
mTrackInfo.GetMinimizeRect(r, buttonRect, t->IsSyncLockSelected());
wxClientDC dc(this);
if (event.Dragging()) {
mTrackInfo.DrawMinimize(&dc, r, t, buttonRect.Contains(event.m_x, event.m_y), t->GetMinimized());
mTrackInfo.DrawMinimize(&dc, r, t, buttonRect.Contains(event.m_x, event.m_y));
}
else if (event.LeftUp()) {
if (buttonRect.Contains(event.m_x, event.m_y)) {
@ -3601,7 +3601,7 @@ void TrackPanel::HandleMinimizing(wxMouseEvent & event)
SetCapturedTrack(NULL);
mTrackInfo.DrawMinimize(&dc, r, t, false, t->GetMinimized());
mTrackInfo.DrawMinimize(&dc, r, t, false);
Refresh(false);
GetActiveProject()->RedrawProject();
}
@ -3915,7 +3915,7 @@ bool TrackPanel::MuteSoloFunc(Track * t, wxRect r, int x, int y,
bool TrackPanel::MinimizeFunc(Track * t, wxRect r, int x, int y)
{
wxRect buttonRect;
mTrackInfo.GetMinimizeRect(r, buttonRect, t->GetMinimized());
mTrackInfo.GetMinimizeRect(r, buttonRect, t->IsSyncLockSelected());
if (!buttonRect.Contains(x, y))
return false;
@ -3923,7 +3923,7 @@ bool TrackPanel::MinimizeFunc(Track * t, wxRect r, int x, int y)
SetCapturedTrack( t, IsMinimizing );
mCapturedRect = r;
mTrackInfo.DrawMinimize(&dc, r, t, true, t->GetMinimized());
mTrackInfo.DrawMinimize(&dc, r, t, true);
return true;
}
@ -5152,7 +5152,7 @@ void TrackPanel::DrawOutside(Track * t, wxDC * dc, const wxRect rec,
mTrackInfo.DrawCloseBox(dc, r, (captured && mMouseCapture==IsClosing));
mTrackInfo.DrawTitleBar(dc, r, t, (captured && mMouseCapture==IsPopping));
mTrackInfo.DrawMinimize(dc, r, t, (captured && mMouseCapture==IsMinimizing), t->GetMinimized());
mTrackInfo.DrawMinimize(dc, r, t, (captured && mMouseCapture==IsMinimizing));
mTrackInfo.DrawBordersWithin( dc, r, bIsWave );
if (bIsWave) {
@ -7213,10 +7213,12 @@ void TrackInfo::GetPanRect(const wxRect r, wxRect & dest) const
dest.height = 25;
}
void TrackInfo::GetMinimizeRect(const wxRect r, wxRect &dest, bool minimized) const
void TrackInfo::GetMinimizeRect(const wxRect r, wxRect &dest, bool bIsSyncLockSelected) const
{
dest.x = r.x + 1;
dest.width = 94;
if (bIsSyncLockSelected)
dest.width -= 12 + 4; // bmpSyncLockIcon is 12x12. Give it 2 pixels either side.
dest.y = r.y + r.height - 18;
dest.height = 15;
}
@ -7274,7 +7276,7 @@ void TrackInfo::GetTrackControlsRect(const wxRect r, wxRect & dest) const
wxRect bot;
GetTitleBarRect(r, top);
GetMinimizeRect(r, bot, false);
GetMinimizeRect(r, bot, false); // Pass false because we do not care about its width here.
dest.x = r.x;
dest.width = GetTitleWidth() - dest.x;
@ -7405,16 +7407,15 @@ void TrackInfo::DrawMuteSolo(wxDC * dc, const wxRect r, Track * t,
}
}
void TrackInfo::DrawMinimize(wxDC * dc, const wxRect r, Track * t, bool down, bool minimized)
void TrackInfo::DrawMinimize(wxDC * dc, const wxRect r, Track * t, bool down)
{
wxRect bev;
GetMinimizeRect(r, bev, minimized);
bool bIsSyncLockSelected = t->IsSyncLockSelected();
GetMinimizeRect(r, bev, bIsSyncLockSelected);
wxBitmap syncLockBitmap(theTheme.Image(bmpSyncLockIcon));
if (t->IsSyncLockSelected())
{
// GetMinimizeRect() sets height to 15, and syncLockBitmap is 12x12.
bev.width -= syncLockBitmap.GetWidth() + 4;
wxBitmap syncLockBitmap(theTheme.Image(bmpSyncLockIcon));
dc->DrawBitmap(syncLockBitmap,
bev.GetRight() + 4,
bev.y + 2,
@ -7437,7 +7438,7 @@ void TrackInfo::DrawMinimize(wxDC * dc, const wxRect r, Track * t, bool down, bo
bev.x - 5 + bev.width / 2,
bev.y - 2 + bev.height / 2,
10,
minimized);
t->GetMinimized());
AColor::BevelTrackInfo(*dc, !down, bev);
}

4
src/TrackPanel.h
View File

@ -111,7 +111,7 @@ private:
void DrawMuteSolo(wxDC * dc, const wxRect r, Track * t, bool down, bool solo, bool bHasSoloButton);
void DrawVRuler(wxDC * dc, const wxRect r, Track * t);
void DrawSliders(wxDC * dc, WaveTrack *t, wxRect r);
void DrawMinimize(wxDC * dc, const wxRect r, Track * t, bool down, bool minimized);
void DrawMinimize(wxDC * dc, const wxRect r, Track * t, bool down);
void GetTrackControlsRect(const wxRect r, wxRect &dest) const;
void GetCloseBoxRect(const wxRect r, wxRect &dest) const;
@ -119,7 +119,7 @@ private:
void GetMuteSoloRect(const wxRect r, wxRect &dest, bool solo, bool bHasSoloButton) const;
void GetGainRect(const wxRect r, wxRect &dest) const;
void GetPanRect(const wxRect r, wxRect &dest) const;
void GetMinimizeRect(const wxRect r, wxRect &dest, bool minimized) const;
void GetMinimizeRect(const wxRect r, wxRect &dest, bool bIsSyncLockSelected) const;
// These arrays are always kept the same size.
LWSliderArray mGains;