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

Paint left and right margins of the whole TrackPanel first

Browse Source
This commit is contained in:
Paul Licameli 2018-10-31 08:26:59 -04:00
parent d0d88118cc
commit a2e392433a
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/TrackPanel.cpp
View File

@ -1051,14 +1051,16 @@ void TrackPanel::DrawTracks(wxDC * dc)
const wxRect clip = GetRect();
TrackPanelDrawingContext context{ *dc, Target(), mLastMouseState };
ClearLeftAndRightMargins(context, clip);
ToolsToolBar *pTtb = mListener->TP_GetToolsToolBar();
bool bMultiToolDown = pTtb->IsDown(multiTool);
bool envelopeFlag = pTtb->IsDown(envelopeTool) || bMultiToolDown;
bool bigPointsFlag = pTtb->IsDown(drawTool) || bMultiToolDown;
bool sliderFlag = bMultiToolDown;
TrackPanelDrawingContext context{ *dc, Target(), mLastMouseState };
// The track artist actually draws the stuff inside each track
mTrackArtist->DrawTracks(context, GetTracks(),
region, clip, GetLeftOffset(),
@ -1604,7 +1606,7 @@ void TrackPanel::DrawOutside
{
// Start with whole track rect
wxRect rect = rec;
DrawOutsideOfTrack(context, rect);
ClearOutsideOfTrack(context, rect);
// Now exclude left, right, and top insets
rect.x += kLeftInset;
@ -1659,11 +1661,32 @@ void TrackPanel::DrawOutside
//mTrackInfo.DrawBordersWithin( dc, rect, *t );
}
// Paint the inset areas of the whole panel, left and right, in a background
// color
void TrackPanel::ClearLeftAndRightMargins
(TrackPanelDrawingContext &context, const wxRect & clip)
{
auto dc = &context.dc;
// Fill in area outside of tracks
AColor::TrackPanelBackground(dc, false);
wxRect side;
// Area between panel border and left track border
side = clip;
side.width = kLeftMargin;
dc->DrawRectangle(side);
// Area between panel border and right track border
side = clip;
side.x += side.width - kRightMargin;
side.width = kRightMargin;
dc->DrawRectangle(side);
}
// Given rectangle should be the whole track rectangle
// Paint the inset areas left, top, and right in a background color
// If linked to a following channel, also paint the separator area, which
// overlaps the next track rectangle's top
void TrackPanel::DrawOutsideOfTrack
// Paint the inset area above in a background color
void TrackPanel::ClearOutsideOfTrack
(TrackPanelDrawingContext &context, const wxRect & rect)
{
auto dc = &context.dc;
@ -1672,21 +1695,10 @@ void TrackPanel::DrawOutsideOfTrack
AColor::TrackPanelBackground(dc, false);
wxRect side;
// Area between panel border and left track border
side = rect;
side.width = kLeftInset;
dc->DrawRectangle(side);
// Area between panel border and top track border
side = rect;
side.height = kTopInset;
dc->DrawRectangle(side);
// Area between panel border and right track border
side = rect;
side.x += side.width - kRightInset;
side.width = kRightInset;
dc->DrawRectangle(side);
}
void TrackPanel::DrawSash(

4
src/TrackPanel.h
View File

@ -377,7 +377,9 @@ protected:
void HighlightFocusedTrack (wxDC* dc, const wxRect &rect);
void DrawShadow ( wxDC* dc, const wxRect & rect );
void DrawBordersAroundTrack(wxDC* dc, const wxRect & rect );
void DrawOutsideOfTrack (
void ClearLeftAndRightMargins (
TrackPanelDrawingContext &context, const wxRect & clip);
void ClearOutsideOfTrack (
TrackPanelDrawingContext &context, const wxRect & rect);
void DrawSash (
wxDC* dc, const wxRect & rect, int labelw, bool bSelected );