Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00
Code Issues Releases Wiki Activity

Don't overlap MIDI channel buttons with menu button & slider...

Browse Source 
... and placement of them, and of velocity slider, is also by table
This commit is contained in:
Paul Licameli 2017-06-04 20:47:43 -04:00
parent b8492d02d6
commit 672f47d4da
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/TrackPanel.cpp
View File

@ -5186,6 +5186,8 @@ enum : unsigned {
kItemSolo = 1 << 3, kItemSolo = 1 << 3,
kItemGain = 1 << 4, kItemGain = 1 << 4,
kItemPan = 1 << 5, kItemPan = 1 << 5,
kItemVelocity = 1 << 6,
kItemMidiControlsRect = 1 << 7,
}; };
struct TCPLine { struct TCPLine {
@ -5236,6 +5238,8 @@ const TCPLine waveTrackTCPLines[] = {
const TCPLine noteTrackTCPLines[] = { const TCPLine noteTrackTCPLines[] = {
COMMON_ITEMS(0) COMMON_ITEMS(0)
MUTE_SOLO_ITEMS(0) MUTE_SOLO_ITEMS(0)
{ kItemMidiControlsRect, kMidiCellHeight * 4, 0 },
{ kItemVelocity, kTrackInfoSliderHeight, 5 },
{ 0, 0, 0 } { 0, 0, 0 }
}; };
@ -9365,9 +9369,10 @@ void TrackInfo::GetPanRect(const wxPoint &topleft, wxRect & dest) const
void TrackInfo::GetVelocityRect(const wxPoint &topleft, wxRect & dest) const void TrackInfo::GetVelocityRect(const wxPoint &topleft, wxRect & dest) const
{ {
dest.x = topleft.x + 7; dest.x = topleft.x + 7;
dest.y = topleft.y + 100; auto results = CalcItemY( noteTrackTCPLines, kItemVelocity );
dest.y = topleft.y + results.first;
dest.width = 84; dest.width = 84;
dest.height = 25; dest.height = results.second;
} }
#endif #endif
@ -9394,8 +9399,9 @@ void TrackInfo::GetMidiControlsRect(const wxRect & rect, wxRect & dest) const
{ {
dest.x = rect.x + 2; // To center slightly dest.x = rect.x + 2; // To center slightly
dest.width = kMidiCellWidth * 4; dest.width = kMidiCellWidth * 4;
dest.y = rect.y + 34; auto results = CalcItemY( noteTrackTCPLines, kItemMidiControlsRect );
dest.height = kMidiCellHeight * 4; dest.y = rect.y + results.first;
dest.height = results.second;
} }
#endif #endif