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

Reimplement the logic for drawing label track selection background

Browse Source
This commit is contained in:
Paul Licameli 2018-11-03 14:59:58 -04:00
parent f8e0ffb31b
commit c866ed4bf7
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/LabelTrack.cpp
View File

@ -797,7 +797,8 @@ void LabelTrack::Draw
TrackArtist::DrawBackgroundWithSelection(&dc, r, this, TrackArtist::DrawBackgroundWithSelection(&dc, r, this,
AColor::labelSelectedBrush, AColor::labelUnselectedBrush, AColor::labelSelectedBrush, AColor::labelUnselectedBrush,
selectedRegion, zoomInfo); selectedRegion, zoomInfo,
( GetSelected() || IsSyncLockSelected() ) );
wxCoord textWidth, textHeight; wxCoord textWidth, textHeight;

15
src/TrackArtist.cpp
View File

@ -3139,13 +3139,7 @@ void TrackArtist::DrawLabelTrack(TrackPanelDrawingContext &context,
const SelectedRegion &selectedRegion, const SelectedRegion &selectedRegion,
const ZoomInfo &zoomInfo) const ZoomInfo &zoomInfo)
{ {
double sel0 = selectedRegion.t0(); track->Draw(context, rect, selectedRegion, zoomInfo);
double sel1 = selectedRegion.t1();
if (!track->GetSelected() && !track->IsSyncLockSelected())
sel0 = sel1 = 0.0;
track->Draw(context, rect, SelectedRegion(sel0, sel1), zoomInfo);
} }
void TrackArtist::DrawTimeTrack(TrackPanelDrawingContext &context, void TrackArtist::DrawTimeTrack(TrackPanelDrawingContext &context,
@ -3301,11 +3295,12 @@ void TrackArtist::DrawSyncLockTiles(wxDC *dc, const wxRect &rect)
void TrackArtist::DrawBackgroundWithSelection(wxDC *dc, const wxRect &rect, void TrackArtist::DrawBackgroundWithSelection(wxDC *dc, const wxRect &rect,
const Track *track, const wxBrush &selBrush, const wxBrush &unselBrush, const Track *track, const wxBrush &selBrush, const wxBrush &unselBrush,
const SelectedRegion &selectedRegion, const ZoomInfo &zoomInfo) const SelectedRegion &selectedRegion, const ZoomInfo &zoomInfo,
bool useSelection)
{ {
//MM: Draw background. We should optimize that a bit more. //MM: Draw background. We should optimize that a bit more.
const double sel0 = selectedRegion.t0(); const double sel0 = useSelection ? selectedRegion.t0() : 0.0;
const double sel1 = selectedRegion.t1(); const double sel1 = useSelection ? selectedRegion.t1() : 0.0;
dc->SetPen(*wxTRANSPARENT_PEN); dc->SetPen(*wxTRANSPARENT_PEN);
if (track->GetSelected() || track->IsSyncLockSelected()) if (track->GetSelected() || track->IsSyncLockSelected())

3
src/TrackArtist.h
View File

@ -89,7 +89,8 @@ class AUDACITY_DLL_API TrackArtist {
// Helper: draws background with selection rect // Helper: draws background with selection rect
static void DrawBackgroundWithSelection(wxDC *dc, const wxRect &rect, static void DrawBackgroundWithSelection(wxDC *dc, const wxRect &rect,
const Track *track, const wxBrush &selBrush, const wxBrush &unselBrush, const Track *track, const wxBrush &selBrush, const wxBrush &unselBrush,
const SelectedRegion &selectedRegion, const ZoomInfo &zoomInfo); const SelectedRegion &selectedRegion, const ZoomInfo &zoomInfo,
bool useSelection = true);
private: private: