Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-07 15:05:38 +01:00
Code Issues Releases Wiki Activity

Minimized state moved into TrackView

Browse Source
This commit is contained in:
Paul Licameli
2019-06-18 11:29:38 -04:00
parent 7a91cc8e8d
commit 3797a5227a
14 changed files with 108 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/TrackPanelResizeHandle.cpp
View File

@@ -19,6 +19,7 @@ Paul Licameli split from TrackPanel.cpp
#include "RefreshCode.h"
#include "Track.h"
#include "TrackPanelMouseEvent.h"
#include "tracks/ui/TrackView.h"
HitTestPreview TrackPanelResizeHandle::HitPreview(bool bLinked)
{
@@ -68,7 +69,7 @@ TrackPanelResizeHandle::TrackPanelResizeHandle
auto last = *channels.rbegin();
mInitialTrackHeight = last->GetHeight();
mInitialActualHeight = last->GetActualHeight();
mInitialMinimized = last->GetMinimized();
mInitialMinimized = TrackView::Get( *last ).GetMinimized();
if (channels.size() > 1) {
auto first = *channels.begin();
@@ -104,11 +105,12 @@ UIHandle::Result TrackPanelResizeHandle::Drag
//
// This used to be in HandleResizeClick(), but simply clicking
// on a resize border would switch the minimized state.
if (pTrack->GetMinimized()) {
auto &data = TrackView::Get( *pTrack );
if (data.GetMinimized()) {
auto channels = TrackList::Channels( pTrack.get() );
for (auto channel : channels) {
channel->SetHeight(channel->GetHeight());
channel->SetMinimized(false);
TrackView::Get( *channel ).SetMinimized( false );
}
if (channels.size() > 1) {
@@ -234,25 +236,25 @@ UIHandle::Result TrackPanelResizeHandle::Cancel(AudacityProject *pProject)
case IsResizing:
{
pTrack->SetHeight(mInitialActualHeight);
pTrack->SetMinimized(mInitialMinimized);
TrackView::Get( *pTrack ).SetMinimized( mInitialMinimized );
}
break;
case IsResizingBetweenLinkedTracks:
{
Track *const next = * ++ tracks.Find(pTrack.get());
pTrack->SetHeight(mInitialUpperActualHeight);
pTrack->SetMinimized(mInitialMinimized);
TrackView::Get( *pTrack ).SetMinimized( mInitialMinimized );
next->SetHeight(mInitialActualHeight);
next->SetMinimized(mInitialMinimized);
TrackView::Get( *next ).SetMinimized( mInitialMinimized );
}
break;
case IsResizingBelowLinkedTracks:
{
Track *const prev = * -- tracks.Find(pTrack.get());
pTrack->SetHeight(mInitialActualHeight);
pTrack->SetMinimized(mInitialMinimized);
TrackView::Get( *pTrack ).SetMinimized( mInitialMinimized );
prev->SetHeight(mInitialUpperActualHeight);
prev->SetMinimized(mInitialMinimized);
TrackView::Get( *prev ).SetMinimized( mInitialMinimized );
}
break;
}