Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 16:43:33 +02:00
Code Issues Releases Wiki Activity

Remove GetLink(ed) in track panel drawing and refresh

Browse Source
This commit is contained in:
Paul Licameli
2017-01-12 12:47:07 -05:00
parent 4c75175e41
commit a68184f81d
2 changed files with 73 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/TrackPanel.cpp
View File

@@ -1078,23 +1078,17 @@ void TrackPanel::RefreshTrack(Track *trk, bool refreshbacking)
if (!trk) if (!trk)
return; return;
Track *link = trk->GetLink(); trk = *GetTracks()->FindLeader(trk);
auto height =
if (link && !trk->GetLinked()) { TrackList::Channels(trk).sum( &Track::GetHeight )
trk = link; - kTopInset - kShadowThickness;
link = trk->GetLink();
}
// subtract insets and shadows from the rectangle, but not border // subtract insets and shadows from the rectangle, but not border
// This matters because some separators do paint over the border // This matters because some separators do paint over the border
wxRect rect(kLeftInset, wxRect rect(kLeftInset,
-mViewInfo->vpos + trk->GetY() + kTopInset, -mViewInfo->vpos + trk->GetY() + kTopInset,
GetRect().GetWidth() - kLeftInset - kRightInset - kShadowThickness, GetRect().GetWidth() - kLeftInset - kRightInset - kShadowThickness,
trk->GetHeight() - kTopInset - kShadowThickness); height);
if (link) {
rect.height += link->GetHeight();
}
if( refreshbacking ) if( refreshbacking )
{ {
@@ -1184,41 +1178,24 @@ void TrackPanel::DrawEverythingElse(TrackPanelDrawingContext &context,
trackRect.y = t->GetY() - mViewInfo->vpos; trackRect.y = t->GetY() - mViewInfo->vpos;
trackRect.height = t->GetHeight(); trackRect.height = t->GetHeight();
// If this track is linked to the next one, display a common auto leaderTrack = *GetTracks()->FindLeader( t );
// border for both, otherwise draw a normal border
wxRect rect = trackRect;
bool skipBorder = false;
Track *l = t->GetLink();
if (l && t->GetLinked()) {
rect.height += l->GetHeight();
}
else if (l && trackRect.y >= 0) {
skipBorder = true;
}
// If the previous track is linked to this one but isn't on the screen // If the previous track is linked to this one but isn't on the screen
// (and thus would have been skipped) we need to draw that track's border // (and thus would have been skipped) we need to draw that track's border
// instead. // instead.
const Track *borderTrack = t; bool drawBorder = (t == leaderTrack || trackRect.y < 0);
wxRect borderRect = rect;
if (l && !t->GetLinked() && trackRect.y < 0) if (drawBorder) {
{ wxRect teamRect = trackRect;
borderTrack = l; teamRect.y = leaderTrack->GetY() - mViewInfo->vpos;
// danger with pending tracks?
teamRect.height =
TrackList::Channels(leaderTrack)
.sum( &Track::GetHeight );
borderRect = trackRect;
borderRect.y = l->GetY() - mViewInfo->vpos;
borderRect.height = l->GetHeight();
borderRect.height += t->GetHeight();
}
if (!skipBorder) {
if (mAx->IsFocused(t)) { if (mAx->IsFocused(t)) {
focusRect = borderRect; focusRect = teamRect;
} }
DrawOutside(context, borderTrack, borderRect); DrawOutside(context, leaderTrack, teamRect);
} }
// Believe it or not, we can speed up redrawing if we don't // Believe it or not, we can speed up redrawing if we don't
@@ -1675,7 +1652,9 @@ void TrackInfo::Status1DrawFunction
/// stereo and what sample rate it's using. /// stereo and what sample rate it's using.
auto rate = wt ? wt->GetRate() : 44100.0; auto rate = wt ? wt->GetRate() : 44100.0;
wxString s; wxString s;
if (!wt || (wt->GetLinked())) if (!pTrack || TrackList::Channels(pTrack).size() > 1)
// TODO: more-than-two-channels-message
// more appropriate strings
s = _("Stereo, %dHz"); s = _("Stereo, %dHz");
else { else {
if (wt->GetChannel() == Track::MonoChannel) if (wt->GetChannel() == Track::MonoChannel)
@@ -1714,6 +1693,15 @@ void TrackPanel::DrawOutside
wxRect rect = rec; wxRect rect = rec;
DrawOutsideOfTrack(context, t, rect); DrawOutsideOfTrack(context, t, rect);
{
auto channels = TrackList::Channels(t);
// omit last (perhaps, only) channel
--channels.second;
for (auto channel : channels)
// draw the sash below this channel
DrawSash(channel, dc, rect);
}
// Now exclude left, right, and top insets // Now exclude left, right, and top insets
rect.x += kLeftInset; rect.x += kLeftInset;
rect.y += kTopInset; rect.y += kTopInset;
@@ -1733,7 +1721,16 @@ void TrackPanel::DrawOutside
// TrackArtist::DrawSyncLockTiles(dc, tileFill); // TrackArtist::DrawSyncLockTiles(dc, tileFill);
//} //}
DrawBordersAroundTrack(t, dc, rect, labelw, vrul); DrawBordersAroundTrack(dc, rect, vrul);
{
auto channels = TrackList::Channels(t);
// omit last (perhaps, only) channel
--channels.second;
for (auto channel : channels)
// draw the sash below this channel
DrawBordersAroundSash(channel, dc, rect, labelw);
}
DrawShadow(t, dc, rect); DrawShadow(t, dc, rect);
} }
@@ -1777,16 +1774,17 @@ void TrackPanel::DrawOutsideOfTrack
side.x += side.width - kRightInset; side.x += side.width - kRightInset;
side.width = kRightInset; side.width = kRightInset;
dc->DrawRectangle(side); dc->DrawRectangle(side);
}
// Area between tracks of stereo group void TrackPanel::DrawSash(const Track * t, wxDC * dc, const wxRect & rect)
if (t->GetLinked()) { {
// Paint the channel separator over (what would be) the shadow of the top // Area between channels of a group
// channel, and the top inset of the bottom channel // Paint the channel separator over (what would be) the shadow of this
side = rect; // channel, and the top inset of the following channel
side.y += t->GetHeight() - kShadowThickness; wxRect side = rect;
side.height = kTopInset + kShadowThickness; side.y = t->GetY() - mViewInfo->vpos + t->GetHeight() - kShadowThickness;
dc->DrawRectangle(side); side.height = kTopInset + kShadowThickness;
} dc->DrawRectangle(side);
} }
void TrackPanel::SetBackgroundCell void TrackPanel::SetBackgroundCell
@@ -1979,8 +1977,8 @@ void TrackPanel::VerticalScroll( float fracPosition){
// Given rectangle excludes the insets left, right, and top // Given rectangle excludes the insets left, right, and top
// Draw a rectangular border and also a vertical separator of track controls // Draw a rectangular border and also a vertical separator of track controls
// from the rest (ruler and proper track area) // from the rest (ruler and proper track area)
void TrackPanel::DrawBordersAroundTrack(const Track * t, wxDC * dc, void TrackPanel::DrawBordersAroundTrack(wxDC * dc,
const wxRect & rect, const int labelw, const wxRect & rect,
const int vrul) const int vrul)
{ {
// Border around track and label area // Border around track and label area
@@ -1991,21 +1989,21 @@ void TrackPanel::DrawBordersAroundTrack(const Track * t, wxDC * dc,
rect.width - kShadowThickness, rect.width - kShadowThickness,
rect.height - kShadowThickness); rect.height - kShadowThickness);
// between vruler and TrackInfo // between vruler and TrackInfo
AColor::Line(*dc, vrul, rect.y, vrul, rect.y + rect.height - 1); AColor::Line(*dc, vrul, rect.y, vrul, rect.y + rect.height - 1);
}
// The lines at bottom of 1st track and top of second track of stereo group void TrackPanel::DrawBordersAroundSash(const Track * t, wxDC * dc,
// Possibly replace with DrawRectangle to add left border. const wxRect & rect, const int labelw)
if (t->GetLinked()) { {
// The given rect has had the top inset subtracted int h1 = t->GetY() - mViewInfo->vpos + t->GetHeight();
int h1 = rect.y + t->GetHeight() - kTopInset; // h1 is the top coordinate of the following channel's rectangle
// h1 is the top coordinate of the second tracks' rectangle // Draw (part of) the bottom border of the top channel and top border of the bottom
// Draw (part of) the bottom border of the top channel and top border of the bottom // At left it extends between the vertical rulers too
// At left it extends between the vertical rulers too // These lines stroke over what is otherwise "border" of each channel
// These lines stroke over what is otherwise "border" of each channel AColor::Line(*dc, labelw, h1 - kBottomMargin, rect.x + rect.width - 1, h1 - kBottomMargin);
AColor::Line(*dc, labelw, h1 - kBottomMargin, rect.x + rect.width - 1, h1 - kBottomMargin); AColor::Line(*dc, labelw, h1 + kTopInset, rect.x + rect.width - 1, h1 + kTopInset);
AColor::Line(*dc, labelw, h1 + kTopInset, rect.x + rect.width - 1, h1 + kTopInset);
}
} }
// Given rectangle has insets subtracted left, right, and top // Given rectangle has insets subtracted left, right, and top

18
src/TrackPanel.h
View File

@@ -373,16 +373,20 @@ protected:
void DrawEverythingElse(TrackPanelDrawingContext &context, void DrawEverythingElse(TrackPanelDrawingContext &context,
const wxRegion & region, const wxRegion & region,
const wxRect & clip); const wxRect & clip);
void DrawOutside void DrawOutside(
(TrackPanelDrawingContext &context, TrackPanelDrawingContext &context,
const Track *t, const wxRect & rec); const Track *leaderTrack, const wxRect & teamRect);
void HighlightFocusedTrack (wxDC* dc, const wxRect &rect); void HighlightFocusedTrack (wxDC* dc, const wxRect &rect);
void DrawShadow (const Track *t, wxDC* dc, const wxRect & rect); void DrawShadow (const Track *t, wxDC* dc, const wxRect & rect);
void DrawBordersAroundTrack(const Track *t, wxDC* dc, const wxRect & rect, const int labelw, const int vrul); void DrawBordersAroundTrack(wxDC* dc, const wxRect & rect,
void DrawOutsideOfTrack const int vrul);
(TrackPanelDrawingContext &context, void DrawBordersAroundSash (const Track *t, wxDC* dc, const wxRect & rect,
const Track *t, const wxRect & rect); const int labelw);
void DrawOutsideOfTrack (
TrackPanelDrawingContext &context,
const Track *t, const wxRect & rect);
void DrawSash (const Track *t, wxDC* dc, const wxRect & rect);
public: public:
// Set the object that performs catch-all event handling when the pointer // Set the object that performs catch-all event handling when the pointer