Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-22 08:31:14 +01:00
Code Issues Releases Wiki Activity

Simplify by removing class HitTestResult...

Browse Source 
... Because all hit tests returned all fields blank, or else, returned a
UIHandle object whose Preview method gives the rest of the information; so
the other fields were redundant.
This commit is contained in:
Paul Licameli
2017-07-04 00:48:09 -04:00
parent c079544667
commit b3d62e2ab6
72 changed files with 189 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/tracks/ui/TrackButtonHandles.cpp
View File

@@ -48,7 +48,7 @@ UIHandle::Result MinimizeButtonHandle::CommitChanges
return RefreshNone;
}
HitTestResult MinimizeButtonHandle::HitTest
UIHandlePtr MinimizeButtonHandle::HitTest
(std::weak_ptr<MinimizeButtonHandle> &holder,
const wxMouseState &state, const wxRect &rect, TrackPanelCell *pCell)
{
@@ -59,10 +59,7 @@ HitTestResult MinimizeButtonHandle::HitTest
auto pTrack = static_cast<CommonTrackPanelCell*>(pCell)->FindTrack();
auto result = std::make_shared<MinimizeButtonHandle>( pTrack, buttonRect );
result = AssignUIHandlePtr(holder, result);
return {
HitTestPreview{},
result
};
return result;
}
else
return {};
@@ -102,7 +99,7 @@ UIHandle::Result CloseButtonHandle::CommitChanges
return result;
}
HitTestResult CloseButtonHandle::HitTest
UIHandlePtr CloseButtonHandle::HitTest
(std::weak_ptr<CloseButtonHandle> &holder,
const wxMouseState &state, const wxRect &rect, TrackPanelCell *pCell)
{
@@ -113,10 +110,7 @@ HitTestResult CloseButtonHandle::HitTest
auto pTrack = static_cast<CommonTrackPanelCell*>(pCell)->FindTrack();
auto result = std::make_shared<CloseButtonHandle>( pTrack, buttonRect );
result = AssignUIHandlePtr(holder, result);
return {
HitTestPreview{},
result
};
return result;
}
else
return {};
@@ -144,7 +138,7 @@ UIHandle::Result MenuButtonHandle::CommitChanges
return pCell->DoContextMenu(mRect, pParent, NULL);
}
HitTestResult MenuButtonHandle::HitTest
UIHandlePtr MenuButtonHandle::HitTest
(std::weak_ptr<MenuButtonHandle> &holder,
const wxMouseState &state, const wxRect &rect,
const std::shared_ptr<TrackPanelCell> &pCell)
@@ -156,10 +150,7 @@ HitTestResult MenuButtonHandle::HitTest
auto pTrack = static_cast<CommonTrackPanelCell*>(pCell.get())->FindTrack();
auto result = std::make_shared<MenuButtonHandle>( pCell, pTrack, buttonRect );
result = AssignUIHandlePtr(holder, result);
return {
HitTestPreview{},
result
};
return result;
}
else
return {};