Skip to content

Fix microtuning warning text widening instruments #7805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubiefawn merged 6 commits into from
Nov 13, 2025
Merged

Fix microtuning warning text widening instruments #7805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
61fefe0
Fix microtuning warning from widening instruments
rubiefawn Mar 22, 2025
4cc9acc
Make comment more thorough
rubiefawn Mar 22, 2025
b7706da
Remove fixed-width label hack
rubiefawn Nov 4, 2025
96c1aaa
Set instrument tabs width based off the instrument
rubiefawn Nov 4, 2025
6cf9d41
Restore instrument plugin window size
rubiefawn Nov 5, 2025
9cff868
Remove fix for restoring instrument size
rubiefawn Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/gui/instrument/InstrumentSoundShapingView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ InstrumentSoundShapingView::InstrumentSoundShapingView(QWidget* parent) :
m_singleStreamInfoLabel->setWordWrap(true);
// TODO Could also be rendered in system font size...
m_singleStreamInfoLabel->setFont(adjustedToPixelSize(m_singleStreamInfoLabel->font(), DEFAULT_FONT_SIZE));
m_singleStreamInfoLabel->setFixedWidth(242);

mainLayout->addWidget(m_singleStreamInfoLabel, 0, Qt::AlignTop);
}
Expand Down
19 changes: 19 additions & 0 deletions src/gui/instrument/InstrumentTrackWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,25 @@ void InstrumentTrackWindow::updateInstrumentView()
m_tabWidget->addTab( m_instrumentView, tr( "Plugin" ), "plugin_tab", 0 );
m_tabWidget->setActiveTab( 0 );

// If instrument is resizable, unset size constraints on tabs.
// Otherwise, prevent other tabs from exceeding the size of the
// instrument tab
const auto maxSize = m_instrumentView->isResizable()
? QSize{QWIDGETSIZE_MAX, QWIDGETSIZE_MAX}
: QSize{
std::max(INSTRUMENT_WIDTH, m_instrumentView->width()),
std::max(INSTRUMENT_HEIGHT, m_instrumentView->maximumHeight()),
};
m_tabWidget->setMaximumSize(maxSize);
// Individual tabs must also have their maximum widths set,
// otherwise they will remain wide, and their overflowing contents
// will get clipped.
m_ssView->setMaximumSize(maxSize);
m_instrumentFunctionsView->setMaximumSize(maxSize);
m_effectView->setMaximumSize(maxSize);
m_midiView->setMaximumSize(maxSize);
m_tuningView->setMaximumSize(maxSize);

m_ssView->setFunctionsHidden(m_track->m_instrument->isSingleStreamed());

modelChanged(); // Get the instrument window to refresh
Expand Down
Loading