Mercurial > hg > touchkeys

changeset 38:4d97f5b4f599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disambiguate Rectangle class on Visual Studio
author Andrew McPherson <andrewm@eecs.qmul.ac.uk>
date Fri, 21 Mar 2014 16:17:29 +0000
parents 239b039d3000
children ef9c7ef09397
files Source/GUI/ControlWindowMainComponent.cpp Source/GUI/KeyboardZoneComponent.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Source/GUI/ControlWindowMainComponent.cpp	Fri Mar 21 14:19:51 2014 +0000
+++ b/Source/GUI/ControlWindowMainComponent.cpp	Fri Mar 21 16:17:29 2014 +0000
@@ -308,8 +308,8 @@
     //[UserResized] Add your own custom resize handling here..
     
     // Resize KeyboardZoneComponent to fit new bounds
-    Rectangle<int> const& ourBounds = getBounds();
-    Rectangle<int> keyboardZoneBounds = keyboardZoneTabbedComponent->getBounds();
+    juce::Rectangle<int> const& ourBounds = getBounds();
+    juce::Rectangle<int> keyboardZoneBounds = keyboardZoneTabbedComponent->getBounds();
     keyboardZoneBounds.setHeight(ourBounds.getHeight() - keyboardZoneBounds.getY());
     keyboardZoneTabbedComponent->setBounds(keyboardZoneBounds);
     //[/UserResized]
--- a/Source/GUI/KeyboardZoneComponent.cpp	Fri Mar 21 14:19:51 2014 +0000
+++ b/Source/GUI/KeyboardZoneComponent.cpp	Fri Mar 21 16:17:29 2014 +0000
@@ -280,8 +280,8 @@
     //[UserResized] Add your own custom resize handling here..
     
     // Resize the mapping list to fit the bottom of the window
-    Rectangle<int> const& ourBounds = getBounds();
-    Rectangle<int> mappingBounds = mappingListComponent->getBounds();
+    juce::Rectangle<int> const& ourBounds = getBounds();
+    juce::Rectangle<int> mappingBounds = mappingListComponent->getBounds();
     mappingBounds.setHeight(ourBounds.getHeight() - mappingBounds.getY());
     mappingListComponent->setBounds(mappingBounds);