Mercurial > hg > touchkeys

comparison Source/MainApplicationController.cpp @ 56:b4a2d2ae43cf tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Andrew McPherson <andrewm@eecs.qmul.ac.uk>
date Fri, 23 Nov 2018 15:48:14 +0000
parents 19650b4076ee e468cb91794a
children
comparison
equal deleted inserted replaced
55:19650b4076ee 56:b4a2d2ae43cf
182 keyboardDisplay_.setKeyboardRange(touchkeyController_.lowestKeyPresentMidiNote(), touchkeyController_.highestMidiNote()); 182 keyboardDisplay_.setKeyboardRange(touchkeyController_.lowestKeyPresentMidiNote(), touchkeyController_.highestMidiNote());
183 #ifndef TOUCHKEYS_NO_GUI 183 #ifndef TOUCHKEYS_NO_GUI
184 if(keyboardDisplayWindow_ != 0) { 184 if(keyboardDisplayWindow_ != 0) {
185 keyboardDisplayWindow_->getConstrainer()->setFixedAspectRatio(keyboardDisplay_.keyboardAspectRatio()); 185 keyboardDisplayWindow_->getConstrainer()->setFixedAspectRatio(keyboardDisplay_.keyboardAspectRatio());
186 186
187 Rectangle<int> bounds = keyboardDisplayWindow_->getBounds(); 187 juce::Rectangle<int> bounds = keyboardDisplayWindow_->getBounds();
188 if(bounds.getY() < 44) 188 if(bounds.getY() < 44)
189 bounds.setY(44); 189 bounds.setY(44);
190 keyboardDisplayWindow_->setBoundsConstrained(bounds); 190 keyboardDisplayWindow_->setBoundsConstrained(bounds);
191 } 191 }
192 #endif 192 #endif
483 // Always show 88 keys for log playback since we won't know which keys were actually recorded 483 // Always show 88 keys for log playback since we won't know which keys were actually recorded
484 keyboardDisplay_.setKeyboardRange(21, 108); 484 keyboardDisplay_.setKeyboardRange(21, 108);
485 if(keyboardDisplayWindow_ != 0) { 485 if(keyboardDisplayWindow_ != 0) {
486 keyboardDisplayWindow_->getConstrainer()->setFixedAspectRatio(keyboardDisplay_.keyboardAspectRatio()); 486 keyboardDisplayWindow_->getConstrainer()->setFixedAspectRatio(keyboardDisplay_.keyboardAspectRatio());
487 487
488 Rectangle<int> bounds = keyboardDisplayWindow_->getBounds(); 488 juce::Rectangle<int> bounds = keyboardDisplayWindow_->getBounds();
489 if(bounds.getY() < 44) 489 if(bounds.getY() < 44)
490 bounds.setY(44); 490 bounds.setY(44);
491 keyboardDisplayWindow_->setBoundsConstrained(bounds); 491 keyboardDisplayWindow_->setBoundsConstrained(bounds);
492 } 492 }
493 showKeyboardDisplayWindow(); 493 showKeyboardDisplayWindow();