Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-31 16:09:28 +02:00
Code Issues Releases Wiki Activity

Don't use GetActiveProject drawing pan, gain, velocity sliders

Browse Source
This commit is contained in:
Paul Licameli 2020-01-06 12:41:25 -05:00
parent d244b55709
commit e2adccb461
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
View File

@ -20,6 +20,8 @@ Paul Licameli split from TrackPanel.cpp
#include "NoteTrackSliderHandles.h"
#include "../../../../HitTestResult.h"
#include "../../../../TrackArtist.h"
#include "../../../../TrackPanel.h"
#include "../../../../TrackPanelMouseEvent.h"
#include "../../../../NoteTrack.h"
#include "../../../../widgets/PopupMenuTable.h"
@ -174,12 +176,13 @@ void SliderDrawFunction
( LWSlider *(*Selector)
(const wxRect &sliderRect, const NoteTrack *t, bool captured, wxWindow*),
wxDC *dc, const wxRect &rect, const Track *pTrack,
wxWindow *pParent,
bool captured, bool highlight )
{
wxRect sliderRect = rect;
TrackInfo::GetSliderHorizontalBounds( rect.GetTopLeft(), sliderRect );
auto nt = static_cast<const NoteTrack*>( pTrack );
Selector( sliderRect, nt, captured, nullptr )->OnPaint(*dc, highlight);
Selector( sliderRect, nt, captured, pParent )->OnPaint(*dc, highlight);
}
void VelocitySliderDrawFunction
@ -190,8 +193,13 @@ void VelocitySliderDrawFunction
auto target = dynamic_cast<VelocitySliderHandle*>( context.target.get() );
bool hit = target && target->GetTrack().get() == pTrack;
bool captured = hit && target->IsClicked();
const auto artist = TrackArtist::Get( context );
auto pParent = FindProjectFrame( artist->parent->GetProject() );
SliderDrawFunction(
&NoteTrackControls::VelocitySlider, dc, rect, pTrack, captured, hit);
&NoteTrackControls::VelocitySlider, dc, rect, pTrack,
pParent, captured, hit);
}
void MidiControlsDrawFunction
@ -279,8 +287,7 @@ LWSlider * NoteTrackControls::VelocitySlider
gVelocityCaptured->Set(velocity);
auto slider = (captured ? gVelocityCaptured : gVelocity).get();
slider->SetParent( pParent ? pParent :
FindProjectFrame( ::GetActiveProject() ) );
slider->SetParent( pParent );
return slider;
}
#endif

29
src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
View File

@ -25,6 +25,8 @@ Paul Licameli split from TrackPanel.cpp
#include "../../../../ProjectHistory.h"
#include "../../../../RefreshCode.h"
#include "../../../../ShuttleGui.h"
#include "../../../../TrackArtist.h"
#include "../../../../TrackPanel.h"
#include "../../../../TrackPanelAx.h"
#include "../../../../TrackPanelMouseEvent.h"
#include "../../../../WaveTrack.h"
@ -1098,12 +1100,13 @@ void SliderDrawFunction
( LWSlider *(*Selector)
(const wxRect &sliderRect, const WaveTrack *t, bool captured, wxWindow*),
wxDC *dc, const wxRect &rect, const Track *pTrack,
wxWindow *pParent,
bool captured, bool highlight )
{
wxRect sliderRect = rect;
TrackInfo::GetSliderHorizontalBounds( rect.GetTopLeft(), sliderRect );
auto wt = static_cast<const WaveTrack*>( pTrack );
Selector( sliderRect, wt, captured, nullptr )->OnPaint(*dc, highlight);
Selector( sliderRect, wt, captured, pParent )->OnPaint(*dc, highlight);
}
void PanSliderDrawFunction
@ -1114,8 +1117,13 @@ void PanSliderDrawFunction
auto dc = &context.dc;
bool hit = target && target->GetTrack().get() == pTrack;
bool captured = hit && target->IsClicked();
SliderDrawFunction
( &WaveTrackControls::PanSlider, dc, rect, pTrack, captured, hit);
const auto artist = TrackArtist::Get( context );
auto pParent = FindProjectFrame( artist->parent->GetProject() );
SliderDrawFunction(
&WaveTrackControls::PanSlider, dc, rect, pTrack,
pParent, captured, hit);
}
void GainSliderDrawFunction
@ -1128,8 +1136,13 @@ void GainSliderDrawFunction
if( hit )
hit=hit;
bool captured = hit && target->IsClicked();
SliderDrawFunction
( &WaveTrackControls::GainSlider, dc, rect, pTrack, captured, hit);
const auto artist = TrackArtist::Get( context );
auto pParent = FindProjectFrame( artist->parent->GetProject() );
SliderDrawFunction(
&WaveTrackControls::GainSlider, dc, rect, pTrack,
pParent, captured, hit);
}
void StatusDrawFunction
@ -1269,8 +1282,7 @@ LWSlider * WaveTrackControls::GainSlider
gGainCaptured->Set(gain);
auto slider = (captured ? gGainCaptured : gGain).get();
slider->SetParent( pParent ? pParent :
FindProjectFrame( ::GetActiveProject() ) );
slider->SetParent( pParent );
return slider;
}
@ -1326,8 +1338,7 @@ LWSlider * WaveTrackControls::PanSlider
gPanCaptured->Set(pan);
auto slider = (captured ? gPanCaptured : gPan).get();
slider->SetParent( pParent ? pParent :
FindProjectFrame( ::GetActiveProject() ) );
slider->SetParent( pParent );
return slider;
}