Mercurial > hg > touchkeys

diff 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
line wrap: on
line diff
--- a/Source/MainApplicationController.cpp	Fri Nov 23 15:39:25 2018 +0000
+++ b/Source/MainApplicationController.cpp	Fri Nov 23 15:48:14 2018 +0000
@@ -184,7 +184,7 @@
     if(keyboardDisplayWindow_ != 0) {
         keyboardDisplayWindow_->getConstrainer()->setFixedAspectRatio(keyboardDisplay_.keyboardAspectRatio());
         
-        Rectangle<int> bounds = keyboardDisplayWindow_->getBounds();
+        juce::Rectangle<int> bounds = keyboardDisplayWindow_->getBounds();
         if(bounds.getY() < 44)
             bounds.setY(44);
         keyboardDisplayWindow_->setBoundsConstrained(bounds);
@@ -485,7 +485,7 @@
                 if(keyboardDisplayWindow_ != 0) {
                     keyboardDisplayWindow_->getConstrainer()->setFixedAspectRatio(keyboardDisplay_.keyboardAspectRatio());
                     
-                    Rectangle<int> bounds = keyboardDisplayWindow_->getBounds();
+                    juce::Rectangle<int> bounds = keyboardDisplayWindow_->getBounds();
                     if(bounds.getY() < 44)
                         bounds.setY(44);
                     keyboardDisplayWindow_->setBoundsConstrained(bounds);