Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-01 12:04:49 +02:00
Code Issues Releases Wiki Activity

GetVRulerWidth, GetLabelWidth, GetLeftOffset out of TrackPanel.h...

Browse Source 
... And some things demoted from ViewInfo to ZoomInfo, related to x coordinates
only
This commit is contained in:
Paul Licameli
2019-06-21 11:26:13 -04:00
parent baf31dd72e
commit f87dfd43c1
11 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/AdornedRulerPanel.cpp
View File

@@ -536,18 +536,20 @@ namespace
wxCoord GetPlayHeadX( const AudacityProject *pProject )
{
const auto &tp = TrackPanel::Get( *pProject );
const auto &viewInfo = ViewInfo::Get( *pProject );
int width;
tp.GetTracksUsableArea(&width, NULL);
return tp.GetLeftOffset()
return viewInfo.GetLeftOffset()
+ width * TracksPrefs::GetPinnedHeadPositionPreference();
}
double GetPlayHeadFraction( const AudacityProject *pProject, wxCoord xx )
{
const auto &tp = TrackPanel::Get( *pProject );
const auto &viewInfo = ViewInfo::Get( *pProject );
int width;
tp.GetTracksUsableArea(&width, NULL);
auto fraction = (xx - tp.GetLeftOffset()) / double(width);
auto fraction = (xx - viewInfo.GetLeftOffset()) / double(width);
return std::max(0.0, std::min(1.0, fraction));
}
@@ -1710,10 +1712,11 @@ void AdornedRulerPanel::UpdateQuickPlayPos(wxCoord &mousePosX, bool shiftDown)
{
// Keep Quick-Play within usable track area.
const auto &tp = TrackPanel::Get( *mProject );
const auto &viewInfo = ViewInfo::Get( *mProject );
int width;
tp.GetTracksUsableArea(&width, NULL);
mousePosX = std::max(mousePosX, tp.GetLeftOffset());
mousePosX = std::min(mousePosX, tp.GetLeftOffset() + width - 1);
mousePosX = std::max(mousePosX, viewInfo.GetLeftOffset());
mousePosX = std::min(mousePosX, viewInfo.GetLeftOffset() + width - 1);
mQuickPlayPosUnsnapped = mQuickPlayPos = Pos2Time(mousePosX);