Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/mp_ui/OrganSettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,10 @@ OrganSettingsWindow::OrganSettingsWindow(MasterpieceProcessor& p, std::function<
midiScroll_ = std::make_unique<ScrollHost>(*midi_, 0, [this] { return midi_->contentHeight(); });
tabs_.addTab(TRANS("MIDI"), kBackground, midiScroll_.get(), false);
}
setSize(660, 560);
// Wide enough for a keyboard's row on the MIDI tab at its full widths:
// name, channel, device and the range button (#493). The tabs scroll, so
// the height stays what a 720-pixel screen holds whole.
setSize(780, 560);
}

OrganSettingsWindow::~OrganSettingsWindow() {
Expand Down
5 changes: 4 additions & 1 deletion src/mp_ui/Settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1989,8 +1989,11 @@ void MidiPanel::resized() {
keyboardLabels_[i]->setBounds(kbRow.removeFromLeft(150));
keyboardChannels_[i]->setBounds(kbRow.removeFromLeft(170));
kbRow.removeFromLeft(6);
// In a narrow window the device box gives way first: the range button's
// text shrank to a few pixels when it took the remainder (#493).
const int deviceWidth = juce::jlimit(140, 200, kbRow.getWidth() - 6 - 160);
if (i < keyboardDevices_.size())
keyboardDevices_[i]->setBounds(kbRow.removeFromLeft(200));
keyboardDevices_[i]->setBounds(kbRow.removeFromLeft(deviceWidth));
kbRow.removeFromLeft(6);
if (i < keyboardMore_.size())
keyboardMore_[i]->setBounds(kbRow.removeFromLeft(160).reduced(0, 1));
Expand Down
Loading