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

Bug 1371 - Device Toolbar does not restore large widths when docked.

Browse Source
This commit is contained in:
James Crook 2019-07-30 14:03:28 +01:00
parent aee4e5deaa
commit 5e7368c3a8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/toolbars/DeviceToolBar.cpp
View File

@ -386,8 +386,8 @@ void DeviceToolBar::RegenerateTooltips()
bool DeviceToolBar::Layout()
{
bool ret;
RepositionCombos();
ret = ToolBar::Layout();
RepositionCombos();
return ret;
}
@ -444,7 +444,7 @@ void DeviceToolBar::RepositionCombos()
wxSize desiredInput, desiredOutput, desiredHost, desiredChannels;
float hostRatio, outputRatio, inputRatio, channelsRatio;
// if the toolbar is docked then the width we should use is the project width.
// as the toolbar's with can extend past this.
// as the toolbar's width can extend past this.
GetClientSize(&w, &h);
// FIXME: Note that there's some bug in here, in that even if the prefs show the toolbar

8
src/toolbars/ToolDock.cpp
View File

@ -697,13 +697,17 @@ void ToolDock::LayoutToolBars()
};
VisitLayout(sizeSetter, &mWrappedConfiguration);
// Set tab order
// Set tab order and layout internal controls.
{
ToolBar *lt{};
for ( const auto &place : GetConfiguration() ) {
auto ct = place.pTree->pBar;
if( lt )
if( lt ){
ct->MoveAfterInTabOrder( lt );
// Bug 1371.
// After a dock size change, the toolbars may need relaying inside.
lt->Layout();
}
lt = ct;
}
}