mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

The Point and Rectangle classes are now templated, so can be used for either float or int co-ordinates. This means that wherever you've used these classes, you'll need to replace them with Rectangle<int> or Point<float> in your code. A couple of methods in Path have changed to take advantage of the new ability.

Browse source
This commit is contained in:
Julian Storer 2010-02-07 00:52:30 +00:00
parent 31a102008d
commit 7bc24ae42a
153 changed files with 2258 additions and 2753 deletions
Download patch file Download diff file Expand all files Collapse all files

386
build/linux/JUCE.make
View file

@ -51,11 +51,11 @@ OBJECTS := \
$(OBJDIR)/juce_Primes.o \
$(OBJDIR)/juce_RSAKey.o \
$(OBJDIR)/juce_MD5.o \
$(OBJDIR)/juce_ValueTree.o \
$(OBJDIR)/juce_PropertySet.o \
$(OBJDIR)/juce_NamedValueSet.o \
$(OBJDIR)/juce_MemoryBlock.o \
$(OBJDIR)/juce_Value.o \
$(OBJDIR)/juce_ValueTree.o \
$(OBJDIR)/juce_BitArray.o \
$(OBJDIR)/juce_DynamicObject.o \
$(OBJDIR)/juce_Variant.o \
@ -79,12 +79,12 @@ OBJECTS := \
$(OBJDIR)/juce_GZIPCompressorOutputStream.o \
$(OBJDIR)/juce_InputStream.o \
$(OBJDIR)/juce_StringArray.o \
$(OBJDIR)/juce_String.o \
$(OBJDIR)/juce_StringPairArray.o \
$(OBJDIR)/juce_CharacterFunctions.o \
$(OBJDIR)/juce_LocalisedStrings.o \
$(OBJDIR)/juce_String.o \
$(OBJDIR)/juce_XmlElement.o \
$(OBJDIR)/juce_XmlDocument.o \
$(OBJDIR)/juce_CharacterFunctions.o \
$(OBJDIR)/juce_InterProcessLock.o \
$(OBJDIR)/juce_ReadWriteLock.o \
$(OBJDIR)/juce_Thread.o \
@ -96,8 +96,8 @@ OBJECTS := \
$(OBJDIR)/juce_ApplicationCommandTarget.o \
$(OBJDIR)/juce_Application.o \
$(OBJDIR)/juce_IIRFilter.o \
$(OBJDIR)/juce_AudioSampleBuffer.o \
$(OBJDIR)/juce_AudioDataConverters.o \
$(OBJDIR)/juce_AudioSampleBuffer.o \
$(OBJDIR)/juce_MidiKeyboardState.o \
$(OBJDIR)/juce_MidiMessage.o \
$(OBJDIR)/juce_MidiFile.o \
@ -120,14 +120,14 @@ OBJECTS := \
$(OBJDIR)/juce_AudioSubsectionReader.o \
$(OBJDIR)/juce_AudioThumbnailCache.o \
$(OBJDIR)/juce_AudioCDReader.o \
$(OBJDIR)/juce_AudioThumbnail.o \
$(OBJDIR)/juce_AudioFormatManager.o \
$(OBJDIR)/juce_OggVorbisAudioFormat.o \
$(OBJDIR)/juce_AiffAudioFormat.o \
$(OBJDIR)/juce_AudioFormat.o \
$(OBJDIR)/juce_AudioThumbnail.o \
$(OBJDIR)/juce_FlacAudioFormat.o \
$(OBJDIR)/juce_QuickTimeAudioFormat.o \
$(OBJDIR)/juce_WavAudioFormat.o \
$(OBJDIR)/juce_QuickTimeAudioFormat.o \
$(OBJDIR)/juce_AudioFormat.o \
$(OBJDIR)/juce_AudioFormatReaderSource.o \
$(OBJDIR)/juce_AudioSourcePlayer.o \
$(OBJDIR)/juce_AudioTransportSource.o \
@ -163,67 +163,65 @@ OBJECTS := \
$(OBJDIR)/juce_Colours.o \
$(OBJDIR)/juce_Colour.o \
$(OBJDIR)/juce_ColourGradient.o \
$(OBJDIR)/juce_Graphics.o \
$(OBJDIR)/juce_Justification.o \
$(OBJDIR)/juce_RectanglePlacement.o \
$(OBJDIR)/juce_FillType.o \
$(OBJDIR)/juce_EdgeTable.o \
$(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o \
$(OBJDIR)/juce_EdgeTable.o \
$(OBJDIR)/juce_FillType.o \
$(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o \
$(OBJDIR)/juce_Graphics.o \
$(OBJDIR)/juce_DrawableComposite.o \
$(OBJDIR)/juce_DrawablePath.o \
$(OBJDIR)/juce_DrawableText.o \
$(OBJDIR)/juce_SVGParser.o \
$(OBJDIR)/juce_Drawable.o \
$(OBJDIR)/juce_DrawableText.o \
$(OBJDIR)/juce_DrawableImage.o \
$(OBJDIR)/juce_DrawablePath.o \
$(OBJDIR)/juce_Drawable.o \
$(OBJDIR)/juce_ReduceOpacityEffect.o \
$(OBJDIR)/juce_GlowEffect.o \
$(OBJDIR)/juce_DropShadowEffect.o \
$(OBJDIR)/juce_Font.o \
$(OBJDIR)/juce_TextLayout.o \
$(OBJDIR)/juce_GlyphArrangement.o \
$(OBJDIR)/juce_Typeface.o \
$(OBJDIR)/juce_Path.o \
$(OBJDIR)/juce_Font.o \
$(OBJDIR)/juce_BorderSize.o \
$(OBJDIR)/juce_Line.o \
$(OBJDIR)/juce_Path.o \
$(OBJDIR)/juce_AffineTransform.o \
$(OBJDIR)/juce_Point.o \
$(OBJDIR)/juce_Rectangle.o \
$(OBJDIR)/juce_PathIterator.o \
$(OBJDIR)/juce_PathStrokeType.o \
$(OBJDIR)/juce_PositionedRectangle.o \
$(OBJDIR)/juce_RectangleList.o \
$(OBJDIR)/juce_Image.o \
$(OBJDIR)/juce_PositionedRectangle.o \
$(OBJDIR)/juce_ImageFileFormat.o \
$(OBJDIR)/juce_ImageCache.o \
$(OBJDIR)/juce_ImageConvolutionKernel.o \
$(OBJDIR)/juce_Image.o \
$(OBJDIR)/juce_JPEGLoader.o \
$(OBJDIR)/juce_PNGLoader.o \
$(OBJDIR)/juce_GIFLoader.o \
$(OBJDIR)/juce_ComponentListener.o \
$(OBJDIR)/juce_Desktop.o \
$(OBJDIR)/juce_Component.o \
$(OBJDIR)/juce_Desktop.o \
$(OBJDIR)/juce_ArrowButton.o \
$(OBJDIR)/juce_HyperlinkButton.o \
$(OBJDIR)/juce_TextButton.o \
$(OBJDIR)/juce_ToggleButton.o \
$(OBJDIR)/juce_ShapeButton.o \
$(OBJDIR)/juce_ToolbarButton.o \
$(OBJDIR)/juce_DrawableButton.o \
$(OBJDIR)/juce_ImageButton.o \
$(OBJDIR)/juce_DrawableButton.o \
$(OBJDIR)/juce_Button.o \
$(OBJDIR)/juce_TreeView.o \
$(OBJDIR)/juce_ToolbarButton.o \
$(OBJDIR)/juce_ShapeButton.o \
$(OBJDIR)/juce_ListBox.o \
$(OBJDIR)/juce_Label.o \
$(OBJDIR)/juce_ToolbarItemPalette.o \
$(OBJDIR)/juce_TextEditor.o \
$(OBJDIR)/juce_ToolbarItemComponent.o \
$(OBJDIR)/juce_Toolbar.o \
$(OBJDIR)/juce_TableHeaderComponent.o \
$(OBJDIR)/juce_ProgressBar.o \
$(OBJDIR)/juce_Slider.o \
$(OBJDIR)/juce_ListBox.o \
$(OBJDIR)/juce_ProgressBar.o \
$(OBJDIR)/juce_ComboBox.o \
$(OBJDIR)/juce_TableHeaderComponent.o \
$(OBJDIR)/juce_TableListBox.o \
$(OBJDIR)/juce_TextEditor.o \
$(OBJDIR)/juce_Toolbar.o \
$(OBJDIR)/juce_ToolbarItemComponent.o \
$(OBJDIR)/juce_TreeView.o \
$(OBJDIR)/juce_CPlusPlusCodeTokeniser.o \
$(OBJDIR)/juce_CodeDocument.o \
$(OBJDIR)/juce_CodeEditorComponent.o \
@ -241,29 +239,29 @@ OBJECTS := \
$(OBJDIR)/juce_DirectoryContentsDisplayComponent.o \
$(OBJDIR)/juce_KeyListener.o \
$(OBJDIR)/juce_KeyPress.o \
$(OBJDIR)/juce_KeyboardFocusTraverser.o \
$(OBJDIR)/juce_ModifierKeys.o \
$(OBJDIR)/juce_KeyPressMappingSet.o \
$(OBJDIR)/juce_KeyMappingEditorComponent.o \
$(OBJDIR)/juce_KeyboardFocusTraverser.o \
$(OBJDIR)/juce_ModifierKeys.o \
$(OBJDIR)/juce_ScrollBar.o \
$(OBJDIR)/juce_GroupComponent.o \
$(OBJDIR)/juce_ResizableBorderComponent.o \
$(OBJDIR)/juce_ResizableCornerComponent.o \
$(OBJDIR)/juce_ComponentAnimator.o \
$(OBJDIR)/juce_TabbedComponent.o \
$(OBJDIR)/juce_StretchableLayoutResizerBar.o \
$(OBJDIR)/juce_StretchableObjectResizer.o \
$(OBJDIR)/juce_ComponentAnimator.o \
$(OBJDIR)/juce_ComponentMovementWatcher.o \
$(OBJDIR)/juce_Viewport.o \
$(OBJDIR)/juce_TabbedButtonBar.o \
$(OBJDIR)/juce_StretchableLayoutManager.o \
$(OBJDIR)/juce_ComponentBoundsConstrainer.o \
$(OBJDIR)/juce_TabbedComponent.o \
$(OBJDIR)/juce_StretchableObjectResizer.o \
$(OBJDIR)/juce_MultiDocumentPanel.o \
$(OBJDIR)/juce_ComponentBoundsConstrainer.o \
$(OBJDIR)/juce_LookAndFeel.o \
$(OBJDIR)/juce_OldSchoolLookAndFeel.o \
$(OBJDIR)/juce_PopupMenu.o \
$(OBJDIR)/juce_MenuBarModel.o \
$(OBJDIR)/juce_MenuBarComponent.o \
$(OBJDIR)/juce_PopupMenu.o \
$(OBJDIR)/juce_ComponentDragger.o \
$(OBJDIR)/juce_MouseEvent.o \
$(OBJDIR)/juce_MouseHoverDetector.o \
@ -271,30 +269,30 @@ OBJECTS := \
$(OBJDIR)/juce_MouseCursor.o \
$(OBJDIR)/juce_DragAndDropContainer.o \
$(OBJDIR)/juce_ButtonPropertyComponent.o \
$(OBJDIR)/juce_PropertyPanel.o \
$(OBJDIR)/juce_PropertyComponent.o \
$(OBJDIR)/juce_SliderPropertyComponent.o \
$(OBJDIR)/juce_PropertyPanel.o \
$(OBJDIR)/juce_BooleanPropertyComponent.o \
$(OBJDIR)/juce_TextPropertyComponent.o \
$(OBJDIR)/juce_ChoicePropertyComponent.o \
$(OBJDIR)/juce_ColourSelector.o \
$(OBJDIR)/juce_BooleanPropertyComponent.o \
$(OBJDIR)/juce_BubbleMessageComponent.o \
$(OBJDIR)/juce_SystemTrayIconComponent.o \
$(OBJDIR)/juce_BubbleComponent.o \
$(OBJDIR)/juce_PreferencesPanel.o \
$(OBJDIR)/juce_AudioDeviceSelectorComponent.o \
$(OBJDIR)/juce_DropShadower.o \
$(OBJDIR)/juce_MagnifierComponent.o \
$(OBJDIR)/juce_MidiKeyboardComponent.o \
$(OBJDIR)/juce_OpenGLComponent.o \
$(OBJDIR)/juce_AlertWindow.o \
$(OBJDIR)/juce_BubbleComponent.o \
$(OBJDIR)/juce_ColourSelector.o \
$(OBJDIR)/juce_MagnifierComponent.o \
$(OBJDIR)/juce_SplashScreen.o \
$(OBJDIR)/juce_DialogWindow.o \
$(OBJDIR)/juce_ResizableWindow.o \
$(OBJDIR)/juce_TooltipWindow.o \
$(OBJDIR)/juce_ThreadWithProgressWindow.o \
$(OBJDIR)/juce_DocumentWindow.o \
$(OBJDIR)/juce_AlertWindow.o \
$(OBJDIR)/juce_ComponentPeer.o \
$(OBJDIR)/juce_SplashScreen.o \
$(OBJDIR)/juce_DocumentWindow.o \
$(OBJDIR)/juce_ResizableWindow.o \
$(OBJDIR)/juce_TopLevelWindow.o \
$(OBJDIR)/juce_linux_Midi.o \
$(OBJDIR)/juce_linux_Windowing.o \
@ -412,11 +410,6 @@ $(OBJDIR)/juce_MD5.o: ../../src/cryptography/juce_MD5.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ValueTree.o: ../../src/containers/juce_ValueTree.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PropertySet.o: ../../src/containers/juce_PropertySet.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -437,6 +430,11 @@ $(OBJDIR)/juce_Value.o: ../../src/containers/juce_Value.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ValueTree.o: ../../src/containers/juce_ValueTree.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_BitArray.o: ../../src/containers/juce_BitArray.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -552,22 +550,17 @@ $(OBJDIR)/juce_StringArray.o: ../../src/text/juce_StringArray.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_String.o: ../../src/text/juce_String.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_StringPairArray.o: ../../src/text/juce_StringPairArray.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_CharacterFunctions.o: ../../src/text/juce_CharacterFunctions.cpp
$(OBJDIR)/juce_LocalisedStrings.o: ../../src/text/juce_LocalisedStrings.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_LocalisedStrings.o: ../../src/text/juce_LocalisedStrings.cpp
$(OBJDIR)/juce_String.o: ../../src/text/juce_String.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -582,6 +575,11 @@ $(OBJDIR)/juce_XmlDocument.o: ../../src/text/juce_XmlDocument.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_CharacterFunctions.o: ../../src/text/juce_CharacterFunctions.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_InterProcessLock.o: ../../src/threads/juce_InterProcessLock.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -637,12 +635,12 @@ $(OBJDIR)/juce_IIRFilter.o: ../../src/audio/dsp/juce_IIRFilter.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_AudioSampleBuffer.o: ../../src/audio/dsp/juce_AudioSampleBuffer.cpp
$(OBJDIR)/juce_AudioDataConverters.o: ../../src/audio/dsp/juce_AudioDataConverters.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_AudioDataConverters.o: ../../src/audio/dsp/juce_AudioDataConverters.cpp
$(OBJDIR)/juce_AudioSampleBuffer.o: ../../src/audio/dsp/juce_AudioSampleBuffer.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -757,11 +755,6 @@ $(OBJDIR)/juce_AudioCDReader.o: ../../src/audio/audio_file_formats/juce_AudioCDR
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_AudioThumbnail.o: ../../src/audio/audio_file_formats/juce_AudioThumbnail.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_AudioFormatManager.o: ../../src/audio/audio_file_formats/juce_AudioFormatManager.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -777,7 +770,7 @@ $(OBJDIR)/juce_AiffAudioFormat.o: ../../src/audio/audio_file_formats/juce_AiffAu
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_AudioFormat.o: ../../src/audio/audio_file_formats/juce_AudioFormat.cpp
$(OBJDIR)/juce_AudioThumbnail.o: ../../src/audio/audio_file_formats/juce_AudioThumbnail.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -787,12 +780,17 @@ $(OBJDIR)/juce_FlacAudioFormat.o: ../../src/audio/audio_file_formats/juce_FlacAu
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_WavAudioFormat.o: ../../src/audio/audio_file_formats/juce_WavAudioFormat.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_QuickTimeAudioFormat.o: ../../src/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_WavAudioFormat.o: ../../src/audio/audio_file_formats/juce_WavAudioFormat.cpp
$(OBJDIR)/juce_AudioFormat.o: ../../src/audio/audio_file_formats/juce_AudioFormat.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -972,11 +970,6 @@ $(OBJDIR)/juce_ColourGradient.o: ../../src/gui/graphics/colour/juce_ColourGradie
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Graphics.o: ../../src/gui/graphics/contexts/juce_Graphics.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Justification.o: ../../src/gui/graphics/contexts/juce_Justification.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -987,7 +980,7 @@ $(OBJDIR)/juce_RectanglePlacement.o: ../../src/gui/graphics/contexts/juce_Rectan
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_FillType.o: ../../src/gui/graphics/contexts/juce_FillType.cpp
$(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o: ../../src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -997,7 +990,7 @@ $(OBJDIR)/juce_EdgeTable.o: ../../src/gui/graphics/contexts/juce_EdgeTable.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o: ../../src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp
$(OBJDIR)/juce_FillType.o: ../../src/gui/graphics/contexts/juce_FillType.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1007,27 +1000,22 @@ $(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o: ../../src/gui/graphics/cont
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Graphics.o: ../../src/gui/graphics/contexts/juce_Graphics.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_DrawableComposite.o: ../../src/gui/graphics/drawables/juce_DrawableComposite.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_DrawablePath.o: ../../src/gui/graphics/drawables/juce_DrawablePath.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_DrawableText.o: ../../src/gui/graphics/drawables/juce_DrawableText.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_SVGParser.o: ../../src/gui/graphics/drawables/juce_SVGParser.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Drawable.o: ../../src/gui/graphics/drawables/juce_Drawable.cpp
$(OBJDIR)/juce_DrawableText.o: ../../src/gui/graphics/drawables/juce_DrawableText.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1037,6 +1025,16 @@ $(OBJDIR)/juce_DrawableImage.o: ../../src/gui/graphics/drawables/juce_DrawableIm
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_DrawablePath.o: ../../src/gui/graphics/drawables/juce_DrawablePath.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Drawable.o: ../../src/gui/graphics/drawables/juce_Drawable.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ReduceOpacityEffect.o: ../../src/gui/graphics/effects/juce_ReduceOpacityEffect.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1052,11 +1050,6 @@ $(OBJDIR)/juce_DropShadowEffect.o: ../../src/gui/graphics/effects/juce_DropShado
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Font.o: ../../src/gui/graphics/fonts/juce_Font.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TextLayout.o: ../../src/gui/graphics/fonts/juce_TextLayout.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1072,7 +1065,7 @@ $(OBJDIR)/juce_Typeface.o: ../../src/gui/graphics/fonts/juce_Typeface.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Path.o: ../../src/gui/graphics/geometry/juce_Path.cpp
$(OBJDIR)/juce_Font.o: ../../src/gui/graphics/fonts/juce_Font.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1087,21 +1080,16 @@ $(OBJDIR)/juce_Line.o: ../../src/gui/graphics/geometry/juce_Line.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Path.o: ../../src/gui/graphics/geometry/juce_Path.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_AffineTransform.o: ../../src/gui/graphics/geometry/juce_AffineTransform.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Point.o: ../../src/gui/graphics/geometry/juce_Point.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Rectangle.o: ../../src/gui/graphics/geometry/juce_Rectangle.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PathIterator.o: ../../src/gui/graphics/geometry/juce_PathIterator.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1112,17 +1100,12 @@ $(OBJDIR)/juce_PathStrokeType.o: ../../src/gui/graphics/geometry/juce_PathStroke
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PositionedRectangle.o: ../../src/gui/graphics/geometry/juce_PositionedRectangle.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_RectangleList.o: ../../src/gui/graphics/geometry/juce_RectangleList.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Image.o: ../../src/gui/graphics/imaging/juce_Image.cpp
$(OBJDIR)/juce_PositionedRectangle.o: ../../src/gui/graphics/geometry/juce_PositionedRectangle.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1142,6 +1125,11 @@ $(OBJDIR)/juce_ImageConvolutionKernel.o: ../../src/gui/graphics/imaging/juce_Ima
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Image.o: ../../src/gui/graphics/imaging/juce_Image.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_JPEGLoader.o: ../../src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1162,12 +1150,12 @@ $(OBJDIR)/juce_ComponentListener.o: ../../src/gui/components/juce_ComponentListe
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Desktop.o: ../../src/gui/components/juce_Desktop.cpp
$(OBJDIR)/juce_Component.o: ../../src/gui/components/juce_Component.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Component.o: ../../src/gui/components/juce_Component.cpp
$(OBJDIR)/juce_Desktop.o: ../../src/gui/components/juce_Desktop.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1192,12 +1180,7 @@ $(OBJDIR)/juce_ToggleButton.o: ../../src/gui/components/buttons/juce_ToggleButto
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ShapeButton.o: ../../src/gui/components/buttons/juce_ShapeButton.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ToolbarButton.o: ../../src/gui/components/buttons/juce_ToolbarButton.cpp
$(OBJDIR)/juce_ImageButton.o: ../../src/gui/components/buttons/juce_ImageButton.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1207,17 +1190,22 @@ $(OBJDIR)/juce_DrawableButton.o: ../../src/gui/components/buttons/juce_DrawableB
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ImageButton.o: ../../src/gui/components/buttons/juce_ImageButton.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Button.o: ../../src/gui/components/buttons/juce_Button.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TreeView.o: ../../src/gui/components/controls/juce_TreeView.cpp
$(OBJDIR)/juce_ToolbarButton.o: ../../src/gui/components/buttons/juce_ToolbarButton.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ShapeButton.o: ../../src/gui/components/buttons/juce_ShapeButton.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ListBox.o: ../../src/gui/components/controls/juce_ListBox.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1232,22 +1220,7 @@ $(OBJDIR)/juce_ToolbarItemPalette.o: ../../src/gui/components/controls/juce_Tool
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TextEditor.o: ../../src/gui/components/controls/juce_TextEditor.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ToolbarItemComponent.o: ../../src/gui/components/controls/juce_ToolbarItemComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Toolbar.o: ../../src/gui/components/controls/juce_Toolbar.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TableHeaderComponent.o: ../../src/gui/components/controls/juce_TableHeaderComponent.cpp
$(OBJDIR)/juce_Slider.o: ../../src/gui/components/controls/juce_Slider.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1257,26 +1230,41 @@ $(OBJDIR)/juce_ProgressBar.o: ../../src/gui/components/controls/juce_ProgressBar
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Slider.o: ../../src/gui/components/controls/juce_Slider.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ListBox.o: ../../src/gui/components/controls/juce_ListBox.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ComboBox.o: ../../src/gui/components/controls/juce_ComboBox.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TableHeaderComponent.o: ../../src/gui/components/controls/juce_TableHeaderComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TableListBox.o: ../../src/gui/components/controls/juce_TableListBox.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TextEditor.o: ../../src/gui/components/controls/juce_TextEditor.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_Toolbar.o: ../../src/gui/components/controls/juce_Toolbar.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ToolbarItemComponent.o: ../../src/gui/components/controls/juce_ToolbarItemComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TreeView.o: ../../src/gui/components/controls/juce_TreeView.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_CPlusPlusCodeTokeniser.o: ../../src/gui/components/code_editor/juce_CPlusPlusCodeTokeniser.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1362,16 +1350,6 @@ $(OBJDIR)/juce_KeyPress.o: ../../src/gui/components/keyboard/juce_KeyPress.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_KeyboardFocusTraverser.o: ../../src/gui/components/keyboard/juce_KeyboardFocusTraverser.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ModifierKeys.o: ../../src/gui/components/keyboard/juce_ModifierKeys.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_KeyPressMappingSet.o: ../../src/gui/components/keyboard/juce_KeyPressMappingSet.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1382,6 +1360,16 @@ $(OBJDIR)/juce_KeyMappingEditorComponent.o: ../../src/gui/components/keyboard/ju
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_KeyboardFocusTraverser.o: ../../src/gui/components/keyboard/juce_KeyboardFocusTraverser.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ModifierKeys.o: ../../src/gui/components/keyboard/juce_ModifierKeys.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ScrollBar.o: ../../src/gui/components/layout/juce_ScrollBar.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1402,7 +1390,7 @@ $(OBJDIR)/juce_ResizableCornerComponent.o: ../../src/gui/components/layout/juce_
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ComponentAnimator.o: ../../src/gui/components/layout/juce_ComponentAnimator.cpp
$(OBJDIR)/juce_TabbedComponent.o: ../../src/gui/components/layout/juce_TabbedComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1412,7 +1400,7 @@ $(OBJDIR)/juce_StretchableLayoutResizerBar.o: ../../src/gui/components/layout/ju
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_StretchableObjectResizer.o: ../../src/gui/components/layout/juce_StretchableObjectResizer.cpp
$(OBJDIR)/juce_ComponentAnimator.o: ../../src/gui/components/layout/juce_ComponentAnimator.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1437,12 +1425,7 @@ $(OBJDIR)/juce_StretchableLayoutManager.o: ../../src/gui/components/layout/juce_
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ComponentBoundsConstrainer.o: ../../src/gui/components/layout/juce_ComponentBoundsConstrainer.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TabbedComponent.o: ../../src/gui/components/layout/juce_TabbedComponent.cpp
$(OBJDIR)/juce_StretchableObjectResizer.o: ../../src/gui/components/layout/juce_StretchableObjectResizer.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1452,6 +1435,11 @@ $(OBJDIR)/juce_MultiDocumentPanel.o: ../../src/gui/components/layout/juce_MultiD
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ComponentBoundsConstrainer.o: ../../src/gui/components/layout/juce_ComponentBoundsConstrainer.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_LookAndFeel.o: ../../src/gui/components/lookandfeel/juce_LookAndFeel.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1462,11 +1450,6 @@ $(OBJDIR)/juce_OldSchoolLookAndFeel.o: ../../src/gui/components/lookandfeel/juce
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PopupMenu.o: ../../src/gui/components/menus/juce_PopupMenu.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_MenuBarModel.o: ../../src/gui/components/menus/juce_MenuBarModel.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1477,6 +1460,11 @@ $(OBJDIR)/juce_MenuBarComponent.o: ../../src/gui/components/menus/juce_MenuBarCo
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PopupMenu.o: ../../src/gui/components/menus/juce_PopupMenu.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ComponentDragger.o: ../../src/gui/components/mouse/juce_ComponentDragger.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1512,6 +1500,11 @@ $(OBJDIR)/juce_ButtonPropertyComponent.o: ../../src/gui/components/properties/ju
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PropertyPanel.o: ../../src/gui/components/properties/juce_PropertyPanel.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PropertyComponent.o: ../../src/gui/components/properties/juce_PropertyComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1522,16 +1515,6 @@ $(OBJDIR)/juce_SliderPropertyComponent.o: ../../src/gui/components/properties/ju
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PropertyPanel.o: ../../src/gui/components/properties/juce_PropertyPanel.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_BooleanPropertyComponent.o: ../../src/gui/components/properties/juce_BooleanPropertyComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TextPropertyComponent.o: ../../src/gui/components/properties/juce_TextPropertyComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1542,7 +1525,7 @@ $(OBJDIR)/juce_ChoicePropertyComponent.o: ../../src/gui/components/properties/ju
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ColourSelector.o: ../../src/gui/components/special/juce_ColourSelector.cpp
$(OBJDIR)/juce_BooleanPropertyComponent.o: ../../src/gui/components/properties/juce_BooleanPropertyComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1557,11 +1540,6 @@ $(OBJDIR)/juce_SystemTrayIconComponent.o: ../../src/gui/components/special/juce_
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_BubbleComponent.o: ../../src/gui/components/special/juce_BubbleComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_PreferencesPanel.o: ../../src/gui/components/special/juce_PreferencesPanel.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1577,11 +1555,6 @@ $(OBJDIR)/juce_DropShadower.o: ../../src/gui/components/special/juce_DropShadowe
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_MagnifierComponent.o: ../../src/gui/components/special/juce_MagnifierComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_MidiKeyboardComponent.o: ../../src/gui/components/special/juce_MidiKeyboardComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1592,7 +1565,22 @@ $(OBJDIR)/juce_OpenGLComponent.o: ../../src/gui/components/special/juce_OpenGLCo
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_AlertWindow.o: ../../src/gui/components/windows/juce_AlertWindow.cpp
$(OBJDIR)/juce_BubbleComponent.o: ../../src/gui/components/special/juce_BubbleComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ColourSelector.o: ../../src/gui/components/special/juce_ColourSelector.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_MagnifierComponent.o: ../../src/gui/components/special/juce_MagnifierComponent.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_SplashScreen.o: ../../src/gui/components/windows/juce_SplashScreen.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1602,11 +1590,6 @@ $(OBJDIR)/juce_DialogWindow.o: ../../src/gui/components/windows/juce_DialogWindo
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ResizableWindow.o: ../../src/gui/components/windows/juce_ResizableWindow.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_TooltipWindow.o: ../../src/gui/components/windows/juce_TooltipWindow.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -1617,7 +1600,7 @@ $(OBJDIR)/juce_ThreadWithProgressWindow.o: ../../src/gui/components/windows/juce
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_DocumentWindow.o: ../../src/gui/components/windows/juce_DocumentWindow.cpp
$(OBJDIR)/juce_AlertWindow.o: ../../src/gui/components/windows/juce_AlertWindow.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -1627,7 +1610,12 @@ $(OBJDIR)/juce_ComponentPeer.o: ../../src/gui/components/windows/juce_ComponentP
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_SplashScreen.o: ../../src/gui/components/windows/juce_SplashScreen.cpp
$(OBJDIR)/juce_DocumentWindow.o: ../../src/gui/components/windows/juce_DocumentWindow.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/juce_ResizableWindow.o: ../../src/gui/components/windows/juce_ResizableWindow.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

12
build/macosx/Juce.xcodeproj/project.pbxproj
View file

@ -542,7 +542,6 @@
8481706010809E00008FEC33 /* juce_PluginDirectoryScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E7D010403614006A1807 /* juce_PluginDirectoryScanner.cpp */; };
8481706110809E00008FEC33 /* juce_PluginListComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E7D210403614006A1807 /* juce_PluginListComponent.cpp */; };
8481706210809E00008FEC33 /* juce_PNGLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB7910403709006A1807 /* juce_PNGLoader.cpp */; };
8481706310809E00008FEC33 /* juce_Point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6310403709006A1807 /* juce_Point.cpp */; };
8481706410809E00008FEC33 /* juce_PopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EACA10403709006A1807 /* juce_PopupMenu.cpp */; };
8481706510809E00008FEC33 /* juce_PositionedRectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6510403709006A1807 /* juce_PositionedRectangle.cpp */; };
8481706610809E00008FEC33 /* juce_posix_NamedPipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8484E9D7103C95A6008B7C6C /* juce_posix_NamedPipe.cpp */; };
@ -557,7 +556,6 @@
8481706F10809E00008FEC33 /* juce_Random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E8FB10403681006A1807 /* juce_Random.cpp */; };
8481707010809E00008FEC33 /* juce_ReadWriteLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E9DD104036D6006A1807 /* juce_ReadWriteLock.cpp */; };
8481707110809E00008FEC33 /* juce_RecentlyOpenedFilesList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E9301040369C006A1807 /* juce_RecentlyOpenedFilesList.cpp */; };
8481707210809E00008FEC33 /* juce_Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6710403709006A1807 /* juce_Rectangle.cpp */; };
8481707310809E00008FEC33 /* juce_RectangleList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6910403709006A1807 /* juce_RectangleList.cpp */; };
8481707410809E00008FEC33 /* juce_RectanglePlacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB3710403709006A1807 /* juce_RectanglePlacement.cpp */; };
8481707510809E00008FEC33 /* juce_ReduceOpacityEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB4B10403709006A1807 /* juce_ReduceOpacityEffect.cpp */; };
@ -1206,11 +1204,9 @@
84F1ECD31040370A006A1807 /* juce_PathIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1EB6010403709006A1807 /* juce_PathIterator.h */; };
84F1ECD41040370A006A1807 /* juce_PathStrokeType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6110403709006A1807 /* juce_PathStrokeType.cpp */; };
84F1ECD51040370A006A1807 /* juce_PathStrokeType.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1EB6210403709006A1807 /* juce_PathStrokeType.h */; };
84F1ECD61040370A006A1807 /* juce_Point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6310403709006A1807 /* juce_Point.cpp */; };
84F1ECD71040370A006A1807 /* juce_Point.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1EB6410403709006A1807 /* juce_Point.h */; };
84F1ECD81040370A006A1807 /* juce_PositionedRectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6510403709006A1807 /* juce_PositionedRectangle.cpp */; };
84F1ECD91040370A006A1807 /* juce_PositionedRectangle.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1EB6610403709006A1807 /* juce_PositionedRectangle.h */; };
84F1ECDA1040370A006A1807 /* juce_Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6710403709006A1807 /* juce_Rectangle.cpp */; };
84F1ECDB1040370A006A1807 /* juce_Rectangle.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1EB6810403709006A1807 /* juce_Rectangle.h */; };
84F1ECDC1040370A006A1807 /* juce_RectangleList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1EB6910403709006A1807 /* juce_RectangleList.cpp */; };
84F1ECDD1040370A006A1807 /* juce_RectangleList.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1EB6A10403709006A1807 /* juce_RectangleList.h */; };
@ -1823,11 +1819,9 @@
84F1EB6010403709006A1807 /* juce_PathIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_PathIterator.h; path = ../../src/gui/graphics/geometry/juce_PathIterator.h; sourceTree = SOURCE_ROOT; };
84F1EB6110403709006A1807 /* juce_PathStrokeType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PathStrokeType.cpp; path = ../../src/gui/graphics/geometry/juce_PathStrokeType.cpp; sourceTree = SOURCE_ROOT; };
84F1EB6210403709006A1807 /* juce_PathStrokeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_PathStrokeType.h; path = ../../src/gui/graphics/geometry/juce_PathStrokeType.h; sourceTree = SOURCE_ROOT; };
84F1EB6310403709006A1807 /* juce_Point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Point.cpp; path = ../../src/gui/graphics/geometry/juce_Point.cpp; sourceTree = SOURCE_ROOT; };
84F1EB6410403709006A1807 /* juce_Point.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_Point.h; path = ../../src/gui/graphics/geometry/juce_Point.h; sourceTree = SOURCE_ROOT; };
84F1EB6510403709006A1807 /* juce_PositionedRectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PositionedRectangle.cpp; path = ../../src/gui/graphics/geometry/juce_PositionedRectangle.cpp; sourceTree = SOURCE_ROOT; };
84F1EB6610403709006A1807 /* juce_PositionedRectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_PositionedRectangle.h; path = ../../src/gui/graphics/geometry/juce_PositionedRectangle.h; sourceTree = SOURCE_ROOT; };
84F1EB6710403709006A1807 /* juce_Rectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Rectangle.cpp; path = ../../src/gui/graphics/geometry/juce_Rectangle.cpp; sourceTree = SOURCE_ROOT; };
84F1EB6810403709006A1807 /* juce_Rectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_Rectangle.h; path = ../../src/gui/graphics/geometry/juce_Rectangle.h; sourceTree = SOURCE_ROOT; };
84F1EB6910403709006A1807 /* juce_RectangleList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RectangleList.cpp; path = ../../src/gui/graphics/geometry/juce_RectangleList.cpp; sourceTree = SOURCE_ROOT; };
84F1EB6A10403709006A1807 /* juce_RectangleList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_RectangleList.h; path = ../../src/gui/graphics/geometry/juce_RectangleList.h; sourceTree = SOURCE_ROOT; };
@ -2877,11 +2871,9 @@
84F1EB6010403709006A1807 /* juce_PathIterator.h */,
84F1EB6110403709006A1807 /* juce_PathStrokeType.cpp */,
84F1EB6210403709006A1807 /* juce_PathStrokeType.h */,
84F1EB6310403709006A1807 /* juce_Point.cpp */,
84F1EB6410403709006A1807 /* juce_Point.h */,
84F1EB6510403709006A1807 /* juce_PositionedRectangle.cpp */,
84F1EB6610403709006A1807 /* juce_PositionedRectangle.h */,
84F1EB6710403709006A1807 /* juce_Rectangle.cpp */,
84F1EB6810403709006A1807 /* juce_Rectangle.h */,
84F1EB6910403709006A1807 /* juce_RectangleList.cpp */,
84F1EB6A10403709006A1807 /* juce_RectangleList.h */,
@ -3842,7 +3834,6 @@
8481706010809E00008FEC33 /* juce_PluginDirectoryScanner.cpp in Sources */,
8481706110809E00008FEC33 /* juce_PluginListComponent.cpp in Sources */,
8481706210809E00008FEC33 /* juce_PNGLoader.cpp in Sources */,
8481706310809E00008FEC33 /* juce_Point.cpp in Sources */,
8481706410809E00008FEC33 /* juce_PopupMenu.cpp in Sources */,
8481706510809E00008FEC33 /* juce_PositionedRectangle.cpp in Sources */,
8481706610809E00008FEC33 /* juce_posix_NamedPipe.cpp in Sources */,
@ -3857,7 +3848,6 @@
8481706F10809E00008FEC33 /* juce_Random.cpp in Sources */,
8481707010809E00008FEC33 /* juce_ReadWriteLock.cpp in Sources */,
8481707110809E00008FEC33 /* juce_RecentlyOpenedFilesList.cpp in Sources */,
8481707210809E00008FEC33 /* juce_Rectangle.cpp in Sources */,
8481707310809E00008FEC33 /* juce_RectangleList.cpp in Sources */,
8481707410809E00008FEC33 /* juce_RectanglePlacement.cpp in Sources */,
8481707510809E00008FEC33 /* juce_ReduceOpacityEffect.cpp in Sources */,
@ -4201,9 +4191,7 @@
84F1ECD01040370A006A1807 /* juce_Path.cpp in Sources */,
84F1ECD21040370A006A1807 /* juce_PathIterator.cpp in Sources */,
84F1ECD41040370A006A1807 /* juce_PathStrokeType.cpp in Sources */,
84F1ECD61040370A006A1807 /* juce_Point.cpp in Sources */,
84F1ECD81040370A006A1807 /* juce_PositionedRectangle.cpp in Sources */,
84F1ECDA1040370A006A1807 /* juce_Rectangle.cpp in Sources */,
84F1ECDC1040370A006A1807 /* juce_RectangleList.cpp in Sources */,
84F1ECDF1040370A006A1807 /* juce_Image.cpp in Sources */,
84F1ECE11040370A006A1807 /* juce_ImageCache.cpp in Sources */,

8
build/win32/vc8/JUCE.vcproj
View file

@ -2471,10 +2471,6 @@
RelativePath="..\..\..\src\gui\graphics\geometry\juce_PathStrokeType.h"
>
</File>
<File
RelativePath="..\..\..\src\gui\graphics\geometry\juce_Point.cpp"
>
</File>
<File
RelativePath="..\..\..\src\gui\graphics\geometry\juce_Point.h"
>
@ -2487,10 +2483,6 @@
RelativePath="..\..\..\src\gui\graphics\geometry\juce_PositionedRectangle.h"
>
</File>
<File
RelativePath="..\..\..\src\gui\graphics\geometry\juce_Rectangle.cpp"
>
</File>
<File
RelativePath="..\..\..\src\gui\graphics\geometry\juce_Rectangle.h"
>

8
extras/audio plugin host/src/host/GraphEditorPanel.cpp
View file

@ -540,10 +540,10 @@ public:
float x1, y1, x2, y2;
getPoints (x1, y1, x2, y2);
const Rectangle newBounds ((int) jmin (x1, x2) - 4,
(int) jmin (y1, y2) - 4,
(int) fabsf (x1 - x2) + 8,
(int) fabsf (y1 - y2) + 8);
const Rectangle<int> newBounds ((int) jmin (x1, x2) - 4,
(int) jmin (y1, y2) - 4,
(int) fabsf (x1 - x2) + 8,
(int) fabsf (y1 - y2) + 8);
if (newBounds != getBounds())
setBounds (newBounds);

6
extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm
View file

@ -29,8 +29,7 @@
#include <AudioToolbox/AudioUnitUtilities.h>
#include "AUMIDIEffectBase.h"
#include "MusicDeviceBase.h"
#include "../juce_PluginHeaders.h"
#include "../juce_PluginHostType.h"
#include "../juce_IncludeCharacteristics.h"
#if JucePlugin_Build_AU
@ -48,6 +47,9 @@
class JuceAUView;
#endif
#include "../juce_PluginHeaders.h"
#include "../juce_PluginHostType.h"
//==============================================================================
#define juceFilterObjectPropertyID 0x1a45ffe9
static VoidArray activePlugins, activeUIs;

4
extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.cpp
View file

@ -45,8 +45,6 @@ StandaloneFilterWindow::StandaloneFilterWindow (const String& title,
{
setTitleBarButtonsRequired (DocumentWindow::minimiseButton | DocumentWindow::closeButton, false);
PropertySet* const globalSettings = getGlobalSettings();
optionsButton = new TextButton (T("options"));
Component::addAndMakeVisible (optionsButton);
optionsButton->addButtonListener (this);
@ -58,6 +56,8 @@ StandaloneFilterWindow::StandaloneFilterWindow (const String& title,
if (filter != 0)
{
PropertySet* const globalSettings = getGlobalSettings();
deviceManager = new AudioFilterStreamingDeviceManager();
deviceManager->setFilter (filter);

14
extras/browser plugins/wrapper/juce_NPAPI_GlueCode.cpp
View file

@ -419,8 +419,8 @@ public:
x -= frame.origin.x;
y -= frame.origin.y;
Rectangle rr (frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
Rectangle rr2 (bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
Rectangle<int> rr (frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
Rectangle<int> rr2 (bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
//log (String ((int) x) + ", " + String ((int) y) + " - " + nsStringToJuce([parent description]) + " " + rr.toString() + " " + rr2.toString());
if (x >= 0 && x < frame.size.width && y >= 0 && y < frame.size.height)
@ -479,11 +479,11 @@ public:
#endif
log ("window: " + nsStringToJuce ([win description]));
const Rectangle clip (window->clipRect.left, window->clipRect.top,
const Rectangle<int> clip (window->clipRect.left, window->clipRect.top,
window->clipRect.right - window->clipRect.left,
window->clipRect.bottom - window->clipRect.top);
const Rectangle target ((int) window->x, (int) window->y, (int) window->width, (int) window->height);
const Rectangle intersection (clip.getIntersection (target));
const Rectangle<int> target ((int) window->x, (int) window->y, (int) window->width, (int) window->height);
const Rectangle<int> intersection (clip.getIntersection (target));
// in firefox the clip rect is usually out of step with the target rect, but in safari it matches
log ("plugin window clip: " + clip.toString());
@ -501,8 +501,8 @@ public:
NSRect v = [content convertRect: [content frame] toView: nil];
NSRect w = [win frame];
log ("wx: " + Rectangle (v.origin.x, v.origin.y, v.size.width, v.size.height).toString()
+ " " + Rectangle (w.origin.x, w.origin.y, w.size.width, w.size.height).toString());
log ("wx: " + Rectangle<int> (v.origin.x, v.origin.y, v.size.width, v.size.height).toString()
+ " " + Rectangle<int> (w.origin.x, w.origin.y, w.size.width, w.size.height).toString());
// adjust the requested window pos to deal with the content view's origin within the window
wy -= w.size.height - (v.origin.y + v.size.height);

28
extras/juce demo/build/linux/JuceDemo.make
View file

@ -41,9 +41,8 @@ endif
OBJECTS := \
$(OBJDIR)/BinaryData.o \
$(OBJDIR)/juce_LibrarySource.o \
$(OBJDIR)/ApplicationStartup.o \
$(OBJDIR)/MainDemoWindow.o \
$(OBJDIR)/AudioDemoLatencyPage.o \
$(OBJDIR)/ApplicationStartup.o \
$(OBJDIR)/AudioDemoPlaybackPage.o \
$(OBJDIR)/AudioDemoSetupPage.o \
$(OBJDIR)/AudioDemoSynthPage.o \
@ -55,12 +54,13 @@ OBJECTS := \
$(OBJDIR)/OpenGLDemo.o \
$(OBJDIR)/QuickTimeDemo.o \
$(OBJDIR)/TableDemo.o \
$(OBJDIR)/ThreadingDemo.o \
$(OBJDIR)/TreeViewDemo.o \
$(OBJDIR)/WebBrowserDemo.o \
$(OBJDIR)/CodeEditorDemo.o \
$(OBJDIR)/RenderingTestComponent.o \
$(OBJDIR)/AudioDemoRecordPage.o \
$(OBJDIR)/AudioDemoLatencyPage.o \
$(OBJDIR)/ThreadingDemo.o \
$(OBJDIR)/WidgetsDemo.o \
MKDIR_TYPE := msdos
@ -113,17 +113,12 @@ $(OBJDIR)/juce_LibrarySource.o: ../../src/juce_LibrarySource.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ApplicationStartup.o: ../../src/ApplicationStartup.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/MainDemoWindow.o: ../../src/MainDemoWindow.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/AudioDemoLatencyPage.o: ../../src/demos/AudioDemoLatencyPage.cpp
$(OBJDIR)/ApplicationStartup.o: ../../src/ApplicationStartup.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@ -183,11 +178,6 @@ $(OBJDIR)/TableDemo.o: ../../src/demos/TableDemo.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ThreadingDemo.o: ../../src/demos/ThreadingDemo.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/TreeViewDemo.o: ../../src/demos/TreeViewDemo.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@ -213,6 +203,16 @@ $(OBJDIR)/AudioDemoRecordPage.o: ../../src/demos/AudioDemoRecordPage.cpp
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/AudioDemoLatencyPage.o: ../../src/demos/AudioDemoLatencyPage.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ThreadingDemo.o: ../../src/demos/ThreadingDemo.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/WidgetsDemo.o: ../../src/demos/WidgetsDemo.cpp
-@$(CMD_MKOBJDIR)
@echo $(notdir $<)

10
extras/juce demo/src/demos/FontsAndTextDemo.cpp
View file

@ -90,17 +90,9 @@ public:
horizontalScaleSlider->addListener (this);
(new Label (String::empty, horizontalScaleSlider->getName()))->attachToComponent (horizontalScaleSlider, true);
for (int i = 0; i < fonts.size(); ++i)
{
if (fonts[i]->getTypefaceName().startsWithIgnoreCase (T("Arial")))
{
listBox->selectRow (i);
break;
}
}
listBox->setColour (ListBox::outlineColourId, Colours::black.withAlpha (0.5f));
listBox->setOutlineThickness (1);
listBox->selectRow (Random::getSystemRandom().nextInt (fonts.size()));
// set up the layout and resizer bars..

13
extras/juce demo/src/demos/RenderingTestComponent.cpp
View file

@ -196,7 +196,7 @@ private:
.scaled (bouncingNumber[2] + 4.0f, bouncingNumber[2] + 4.0f)
.translated (bouncingPointX[2], bouncingPointY[2]));
g.reduceClipRegion (*argbImage,
Rectangle (0, 0, argbImage->getWidth(), argbImage->getHeight()),
Rectangle<int> (0, 0, argbImage->getWidth(), argbImage->getHeight()),
transform);
}
@ -352,13 +352,14 @@ private:
// to make our icon the right size, we'll put it inside a DrawableComposite, and apply
// a transform to get it to the size we want.
float x, y, w, h;
loadedSVG->getBounds (x, y, w, h);
const float scaleFactor = 300.0f / jmax (w, h);
Rectangle<float> bounds = loadedSVG->getBounds();
const float scaleFactor = 300.0f / jmax (bounds.getWidth(), bounds.getHeight());
svgDrawable = new DrawableComposite();
svgDrawable->insertDrawable (loadedSVG, AffineTransform::translation (-(x + w * 0.5f), -(y + h * 0.5f))
.scaled (scaleFactor, scaleFactor));
svgDrawable->insertDrawable (loadedSVG,
AffineTransform::translation (-bounds.getCentreX(),
-bounds.getCentreY())
.scaled (scaleFactor, scaleFactor));
}
}
}

10
extras/juce demo/src/demos/WidgetsDemo.cpp
View file

@ -605,10 +605,10 @@ public:
if (getChildComponent (i) != animateButton)
{
animator.animateComponent (getChildComponent (i),
Rectangle (Random::getSystemRandom().nextInt (getWidth() / 2),
Random::getSystemRandom().nextInt (getHeight() / 2),
60 + Random::getSystemRandom().nextInt (getWidth() / 3),
16 + Random::getSystemRandom().nextInt (getHeight() / 6)),
Rectangle<int> (Random::getSystemRandom().nextInt (getWidth() / 2),
Random::getSystemRandom().nextInt (getHeight() / 2),
60 + Random::getSystemRandom().nextInt (getWidth() / 3),
16 + Random::getSystemRandom().nextInt (getHeight() / 6)),
500 + Random::getSystemRandom().nextInt (2000),
Random::getSystemRandom().nextDouble(),
Random::getSystemRandom().nextDouble());
@ -920,7 +920,7 @@ private:
{
}
void contentAreaChanged (const Rectangle& contentArea)
void contentAreaChanged (const Rectangle<int>& contentArea)
{
comboBox->setSize (contentArea.getWidth() - 2,
jmin (contentArea.getHeight() - 2, 22));

2
extras/the jucer/src/model/components/jucer_ComponentTypeHandler.cpp
View file

@ -258,7 +258,7 @@ void ComponentTypeHandler::setComponentPosition (Component* comp,
comp->getProperties().set ("relativeToW", String::toHexString (newPos.relativeToW));
comp->getProperties().set ("relativeToH", String::toHexString (newPos.relativeToH));
comp->setBounds (newPos.getRectangle (Rectangle (0, 0, comp->getParentWidth(), comp->getParentHeight()),
comp->setBounds (newPos.getRectangle (Rectangle<int> (0, 0, comp->getParentWidth(), comp->getParentHeight()),
layout));
}

4
extras/the jucer/src/model/documents/jucer_ButtonDocument.cpp
View file

@ -310,7 +310,7 @@ public:
if (document->paintStatesEnabled [background])
{
document->paintRoutines [background]->fillWithBackground (g, alwaysFillBackground);
document->paintRoutines [background]->drawElements (g, Rectangle (0, 0, getWidth(), getHeight()));
document->paintRoutines [background]->drawElements (g, Rectangle<int> (0, 0, getWidth(), getHeight()));
}
const int stateIndex
@ -323,7 +323,7 @@ public:
: normalOff));
document->paintRoutines [stateIndex]->fillWithBackground (g, ! document->paintStatesEnabled [background]);
document->paintRoutines [stateIndex]->drawElements (g, Rectangle (0, 0, getWidth(), getHeight()));
document->paintRoutines [stateIndex]->drawElements (g, Rectangle<int> (0, 0, getWidth(), getHeight()));
}
private:

8
extras/the jucer/src/model/documents/jucer_ComponentDocument.cpp
View file

@ -118,7 +118,7 @@ public:
void paint (Graphics& g)
{
document->getPaintRoutine (0)->fillWithBackground (g, alwaysFillBackground);
document->getPaintRoutine (0)->drawElements (g, Rectangle (0, 0, getWidth(), getHeight()));
document->getPaintRoutine (0)->drawElements (g, Rectangle<int> (0, 0, getWidth(), getHeight()));
}
void resized()
@ -138,9 +138,9 @@ public:
if (type != 0)
{
const Rectangle newBounds (type->getComponentPosition (comp)
.getRectangle (Rectangle (0, 0, getWidth(), getHeight()),
document->getComponentLayout()));
const Rectangle<int> newBounds (type->getComponentPosition (comp)
.getRectangle (Rectangle<int> (0, 0, getWidth(), getHeight()),
document->getComponentLayout()));
anyCompsMoved = anyCompsMoved || (comp->getBounds() != newBounds);
comp->setBounds (newBounds);

4
extras/the jucer/src/model/jucer_ComponentLayout.cpp
View file

@ -359,7 +359,7 @@ void ComponentLayout::bringLostItemsBackOnScreen (int width, int height)
{
Component* const c = components[i];
if (! c->getBounds().intersects (Rectangle (0, 0, width, height)))
if (! c->getBounds().intersects (Rectangle<int> (0, 0, width, height)))
{
c->setTopLeftPosition (width / 2, height / 2);
updateStoredComponentPosition (c, false);
@ -492,7 +492,7 @@ void ComponentLayout::setComponentRelativeTarget (Component* comp, int whichDime
{
const int64 compId = ComponentTypeHandler::getComponentId (compToBeRelativeTo);
Rectangle oldBounds (comp->getBounds());
Rectangle<int> oldBounds (comp->getBounds());
RelativePositionedRectangle pos;
if (pe != 0)

21
extras/the jucer/src/model/jucer_PaintRoutine.cpp
View file

@ -436,13 +436,13 @@ void PaintRoutine::ungroupSelected()
}
}
void PaintRoutine::bringLostItemsBackOnScreen (const Rectangle& parentArea)
void PaintRoutine::bringLostItemsBackOnScreen (const Rectangle<int>& parentArea)
{
for (int i = 0; i < elements.size(); ++i)
{
PaintElement* const c = elements[i];
Rectangle r (c->getCurrentBounds (parentArea));
Rectangle<int> r (c->getCurrentBounds (parentArea));
if (! r.intersects (parentArea))
{
@ -452,13 +452,13 @@ void PaintRoutine::bringLostItemsBackOnScreen (const Rectangle& parentArea)
}
}
void PaintRoutine::startDragging (const Rectangle& parentArea)
void PaintRoutine::startDragging (const Rectangle<int>& parentArea)
{
for (int i = 0; i < elements.size(); ++i)
{
PaintElement* const c = elements[i];
Rectangle r (c->getCurrentBounds (parentArea));
Rectangle<int> r (c->getCurrentBounds (parentArea));
c->getProperties().set ("xDragStart", r.getX());
c->getProperties().set ("yDragStart", r.getY());
@ -467,7 +467,7 @@ void PaintRoutine::startDragging (const Rectangle& parentArea)
getDocument()->getUndoManager().beginNewTransaction();
}
void PaintRoutine::dragSelectedComps (int dx, int dy, const Rectangle& parentArea)
void PaintRoutine::dragSelectedComps (int dx, int dy, const Rectangle<int>& parentArea)
{
getDocument()->getUndoManager().undoCurrentTransactionOnly();
@ -484,7 +484,7 @@ void PaintRoutine::dragSelectedComps (int dx, int dy, const Rectangle& parentAre
const int startX = c->getProperties() ["xDragStart"];
const int startY = c->getProperties() ["yDragStart"];
Rectangle r (c->getCurrentBounds (parentArea));
Rectangle<int> r (c->getCurrentBounds (parentArea));
if (document != 0 && selectedElements.getNumSelected() == 1)
{
@ -524,7 +524,7 @@ void PaintRoutine::fillWithBackground (Graphics& g, const bool drawOpaqueBackgro
}
}
void PaintRoutine::drawElements (Graphics& g, const Rectangle& relativeTo)
void PaintRoutine::drawElements (Graphics& g, const Rectangle<int>& relativeTo)
{
Component temp;
temp.setBounds (relativeTo);
@ -540,8 +540,7 @@ void PaintRoutine::dropImageAt (const File& f, int x, int y)
if (d != 0)
{
float ix, iy, iw, ih;
d->getBounds (ix, iy, iw, ih);
Rectangle<float> bounds (d->getBounds());
delete d;
PaintElement* newElement
@ -569,8 +568,8 @@ void PaintRoutine::dropImageAt (const File& f, int x, int y)
pei->setResource (resourceName, true);
const int imageW = (int) (ix + iw + 1.0f);
const int imageH = (int) (iy + ih + 1.0f);
const int imageW = (int) (bounds.getRight() + 1.0f);
const int imageH = (int) (bounds.getBottom() + 1.0f);
RelativePositionedRectangle pr;
pr.rect.setX (x - imageW / 2);

8
extras/the jucer/src/model/jucer_PaintRoutine.h
View file

@ -66,7 +66,7 @@ public:
void setBackgroundColour (const Colour& newColour) throw();
void fillWithBackground (Graphics& g, const bool drawOpaqueBackground);
void drawElements (Graphics& g, const Rectangle& relativeTo);
void drawElements (Graphics& g, const Rectangle<int>& relativeTo);
void dropImageAt (const File& f, int x, int y);
@ -86,11 +86,11 @@ public:
void groupSelected();
void ungroupSelected();
void startDragging (const Rectangle& parentArea);
void dragSelectedComps (int dxFromDragStart, int dyFromDragStart, const Rectangle& parentArea);
void startDragging (const Rectangle<int>& parentArea);
void dragSelectedComps (int dxFromDragStart, int dyFromDragStart, const Rectangle<int>& parentArea);
void endDragging();
void bringLostItemsBackOnScreen (const Rectangle& parentArea);
void bringLostItemsBackOnScreen (const Rectangle<int>& parentArea);
//==============================================================================
void setDocument (JucerDocument* const document_) { document = document_; }

10
extras/the jucer/src/model/paintelements/jucer_ColouredElement.cpp
View file

@ -959,7 +959,7 @@ void ColouredElement::createSiblingComponents()
}
}
const Rectangle ColouredElement::getCurrentBounds (const Rectangle& parentArea) const
const Rectangle<int> ColouredElement::getCurrentBounds (const Rectangle<int>& parentArea) const
{
int border = 0;
@ -970,11 +970,11 @@ const Rectangle ColouredElement::getCurrentBounds (const Rectangle& parentArea)
.expanded (border, border);
}
void ColouredElement::setCurrentBounds (const Rectangle& newBounds,
const Rectangle& parentArea,
void ColouredElement::setCurrentBounds (const Rectangle<int>& newBounds,
const Rectangle<int>& parentArea,
const bool undoable)
{
Rectangle r (newBounds);
Rectangle<int> r (newBounds);
if (isStrokePresent)
{
@ -988,7 +988,7 @@ void ColouredElement::setCurrentBounds (const Rectangle& newBounds,
pr.updateFrom (r.getX() - parentArea.getX(),
r.getY() - parentArea.getY(),
r.getWidth(), r.getHeight(),
Rectangle (0, 0, parentArea.getWidth(), parentArea.getHeight()),
Rectangle<int> (0, 0, parentArea.getWidth(), parentArea.getHeight()),
getDocument()->getComponentLayout());
setPosition (pr, undoable);

4
extras/the jucer/src/model/paintelements/jucer_ColouredElement.h
View file

@ -63,8 +63,8 @@ public:
void setStrokeFill (const JucerFillType& newType, const bool undoable);
//==============================================================================
const Rectangle getCurrentBounds (const Rectangle& parentArea) const;
void setCurrentBounds (const Rectangle& newBounds, const Rectangle& parentArea, const bool undoable);
const Rectangle<int> getCurrentBounds (const Rectangle<int>& parentArea) const;
void setCurrentBounds (const Rectangle<int>& newBounds, const Rectangle<int>& parentArea, const bool undoable);
void createSiblingComponents();

8
extras/the jucer/src/model/paintelements/jucer_FillType.cpp
View file

@ -110,7 +110,7 @@ void JucerFillType::reset()
}
//==============================================================================
void JucerFillType::setFillType (Graphics& g, JucerDocument* const document, const Rectangle& parentArea)
void JucerFillType::setFillType (Graphics& g, JucerDocument* const document, const Rectangle<int>& parentArea)
{
if (mode == solidColour)
{
@ -123,7 +123,7 @@ void JucerFillType::setFillType (Graphics& g, JucerDocument* const document, con
{
loadImage (document);
Rectangle r (imageAnchor.getRectangle (parentArea, document->getComponentLayout()));
Rectangle<int> r (imageAnchor.getRectangle (parentArea, document->getComponentLayout()));
g.setTiledImageFill (*image, r.getX(), r.getY(), (float) imageOpacity);
}
@ -132,8 +132,8 @@ void JucerFillType::setFillType (Graphics& g, JucerDocument* const document, con
ImageCache::release (image);
image = 0;
Rectangle r1 (gradPos1.getRectangle (parentArea, document->getComponentLayout()));
Rectangle r2 (gradPos2.getRectangle (parentArea, document->getComponentLayout()));
Rectangle<int> r1 (gradPos1.getRectangle (parentArea, document->getComponentLayout()));
Rectangle<int> r2 (gradPos2.getRectangle (parentArea, document->getComponentLayout()));
g.setGradientFill (ColourGradient (gradCol1, (float) r1.getX(), (float) r1.getY(),
gradCol2, (float) r2.getX(), (float) r2.getY(),

2
extras/the jucer/src/model/paintelements/jucer_FillType.h
View file

@ -46,7 +46,7 @@ public:
bool operator!= (const JucerFillType& other) const throw();
//==============================================================================
void setFillType (Graphics& g, JucerDocument* const document, const Rectangle& parentArea);
void setFillType (Graphics& g, JucerDocument* const document, const Rectangle<int>& parentArea);
void fillInGeneratedCode (GeneratedCode& code, String& paintMethodCode) const;

32
extras/the jucer/src/model/paintelements/jucer_PaintElement.cpp
View file

@ -134,13 +134,13 @@ void PaintElement::setPosition (const RelativePositionedRectangle& newPosition,
}
//==============================================================================
const Rectangle PaintElement::getCurrentBounds (const Rectangle& parentArea) const
const Rectangle<int> PaintElement::getCurrentBounds (const Rectangle<int>& parentArea) const
{
return position.getRectangle (parentArea, getDocument()->getComponentLayout());
}
void PaintElement::setCurrentBounds (const Rectangle& newBounds,
const Rectangle& parentArea,
void PaintElement::setCurrentBounds (const Rectangle<int>& newBounds,
const Rectangle<int>& parentArea,
const bool undoable)
{
RelativePositionedRectangle pr (position);
@ -148,7 +148,7 @@ void PaintElement::setCurrentBounds (const Rectangle& newBounds,
newBounds.getY() - parentArea.getY(),
jmax (1, newBounds.getWidth()),
jmax (1, newBounds.getHeight()),
Rectangle (0, 0, parentArea.getWidth(), parentArea.getHeight()),
Rectangle<int> (0, 0, parentArea.getWidth(), parentArea.getHeight()),
getDocument()->getComponentLayout());
setPosition (pr, undoable);
@ -156,7 +156,7 @@ void PaintElement::setCurrentBounds (const Rectangle& newBounds,
updateBounds (parentArea);
}
void PaintElement::updateBounds (const Rectangle& parentArea)
void PaintElement::updateBounds (const Rectangle<int>& parentArea)
{
if (! parentArea.isEmpty())
{
@ -236,13 +236,13 @@ void PaintElement::parentHierarchyChanged()
}
//==============================================================================
void PaintElement::drawExtraEditorGraphics (Graphics& g, const Rectangle& relativeTo)
void PaintElement::drawExtraEditorGraphics (Graphics& g, const Rectangle<int>& relativeTo)
{
}
void PaintElement::paint (Graphics& g)
{
Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
g.saveState();
g.setOrigin (area.getX() - getX(), area.getY() - getY());
@ -298,7 +298,7 @@ void PaintElement::mouseDrag (const MouseEvent& e)
if (! e.mods.isPopupMenu())
{
jassert (dynamic_cast <PaintRoutineEditor*> (getParentComponent()) != 0);
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
if (selected && ! dragging)
{
@ -337,8 +337,8 @@ void PaintElement::resizeEnd()
}
void PaintElement::checkBounds (int& x, int& y, int& w, int& h,
const Rectangle& previousBounds,
const Rectangle& limits,
const Rectangle<int>& previousBounds,
const Rectangle<int>& limits,
const bool isStretchingTop,
const bool isStretchingLeft,
const bool isStretchingBottom,
@ -356,7 +356,7 @@ void PaintElement::checkBounds (int& x, int& y, int& w, int& h,
if (document != 0 && document->isSnapActive (true))
{
jassert (getParentComponent() != 0);
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
x += borderThickness - area.getX();
y += borderThickness - area.getY();
@ -387,23 +387,23 @@ void PaintElement::checkBounds (int& x, int& y, int& w, int& h,
void PaintElement::applyBoundsToComponent (Component* component, int x, int y, int w, int h)
{
if (getBounds() != Rectangle (x, y, w, h))
if (getBounds() != Rectangle<int> (x, y, w, h))
{
getDocument()->getUndoManager().undoCurrentTransactionOnly();
jassert (dynamic_cast <PaintRoutineEditor*> (getParentComponent()) != 0);
setCurrentBounds (Rectangle (x, y, w, h)
setCurrentBounds (Rectangle<int> (x, y, w, h)
.expanded (-borderThickness, -borderThickness),
((PaintRoutineEditor*) getParentComponent())->getComponentArea(),
true);
}
}
const Rectangle PaintElement::getCurrentAbsoluteBounds() const
const Rectangle<int> PaintElement::getCurrentAbsoluteBounds() const
{
jassert (dynamic_cast <PaintRoutineEditor*> (getParentComponent()) != 0);
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
return position.getRectangle (area, getDocument()->getComponentLayout());
}
@ -411,7 +411,7 @@ const Rectangle PaintElement::getCurrentAbsoluteBounds() const
void PaintElement::getCurrentAbsoluteBoundsDouble (double& x, double& y, double& w, double& h) const
{
jassert (dynamic_cast <PaintRoutineEditor*> (getParentComponent()) != 0);
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
position.getRectangleDouble (x, y, w, h, area, getDocument()->getComponentLayout());
}

16
extras/the jucer/src/model/paintelements/jucer_PaintElement.h
View file

@ -50,13 +50,13 @@ public:
//==============================================================================
virtual void setInitialBounds (int parentWidth, int parentHeight);
virtual const Rectangle getCurrentBounds (const Rectangle& activeArea) const;
virtual void setCurrentBounds (const Rectangle& newBounds, const Rectangle& activeArea, const bool undoable);
virtual const Rectangle<int> getCurrentBounds (const Rectangle<int>& activeArea) const;
virtual void setCurrentBounds (const Rectangle<int>& newBounds, const Rectangle<int>& activeArea, const bool undoable);
const RelativePositionedRectangle& getPosition() const;
void setPosition (const RelativePositionedRectangle& newPosition, const bool undoable);
void updateBounds (const Rectangle& activeArea);
void updateBounds (const Rectangle<int>& activeArea);
const String& getTypeName() const throw() { return typeName; }
PaintRoutine* getOwner() const throw() { return owner; }
@ -64,9 +64,9 @@ public:
//==============================================================================
virtual void draw (Graphics& g,
const ComponentLayout* layout,
const Rectangle& parentArea) = 0;
const Rectangle<int>& parentArea) = 0;
virtual void drawExtraEditorGraphics (Graphics& g, const Rectangle& relativeTo);
virtual void drawExtraEditorGraphics (Graphics& g, const Rectangle<int>& relativeTo);
virtual void getEditableProperties (Array <PropertyComponent*>& properties);
@ -103,8 +103,8 @@ protected:
void resizeStart();
void resizeEnd();
void checkBounds (int& x, int& y, int& w, int& h,
const Rectangle& previousBounds,
const Rectangle& limits,
const Rectangle<int>& previousBounds,
const Rectangle<int>& limits,
const bool isStretchingTop,
const bool isStretchingLeft,
const bool isStretchingBottom,
@ -112,7 +112,7 @@ protected:
void applyBoundsToComponent (Component* component, int x, int y, int w, int h);
const Rectangle getCurrentAbsoluteBounds() const;
const Rectangle<int> getCurrentAbsoluteBounds() const;
void getCurrentAbsoluteBoundsDouble (double& x, double& y, double& w, double& h) const;
virtual void selectionChanged (const bool isSelected);

4
extras/the jucer/src/model/paintelements/jucer_PaintElementEllipse.h
View file

@ -43,11 +43,11 @@ public:
~PaintElementEllipse() {}
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle& parentArea)
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle<int>& parentArea)
{
fillType.setFillType (g, getDocument(), parentArea);
Rectangle r (position.getRectangle (parentArea, layout));
Rectangle<int> r (position.getRectangle (parentArea, layout));
g.fillEllipse ((float) r.getX(), (float) r.getY(), (float) r.getWidth(), (float) r.getHeight());
if (isStrokePresent)

14
extras/the jucer/src/model/paintelements/jucer_PaintElementGroup.h
View file

@ -124,9 +124,9 @@ public:
{
}
const Rectangle getCurrentBounds (const Rectangle& parentArea) const
const Rectangle<int> getCurrentBounds (const Rectangle<int>& parentArea) const
{
Rectangle r;
Rectangle<int> r;
if (subElements.size() > 0)
{
@ -139,13 +139,13 @@ public:
return r;
}
void setCurrentBounds (const Rectangle& b, const Rectangle& parentArea, const bool undoable)
void setCurrentBounds (const Rectangle<int>& b, const Rectangle<int>& parentArea, const bool undoable)
{
Rectangle newBounds (b);
Rectangle<int> newBounds (b);
newBounds.setSize (jmax (1, newBounds.getWidth()),
jmax (1, newBounds.getHeight()));
const Rectangle current (getCurrentBounds (parentArea));
const Rectangle<int> current (getCurrentBounds (parentArea));
if (newBounds != current)
{
@ -161,7 +161,7 @@ public:
{
PaintElement* const e = subElements.getUnchecked(i);
Rectangle pos (e->getCurrentBounds (parentArea));
Rectangle<int> pos (e->getCurrentBounds (parentArea));
const int newX = roundToInt ((pos.getX() - scaleStartX) * scaleX + scaleStartX + dx);
const int newY = roundToInt ((pos.getY() - scaleStartY) * scaleY + scaleStartY + dy);
@ -176,7 +176,7 @@ public:
}
//==============================================================================
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle& parentArea)
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle<int>& parentArea)
{
for (int i = 0; i < subElements.size(); ++i)
subElements.getUnchecked(i)->draw (g, layout, parentArea);

14
extras/the jucer/src/model/paintelements/jucer_PaintElementImage.h
View file

@ -68,9 +68,9 @@ public:
return 0;
}
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle& parentArea)
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle<int>& parentArea)
{
const Rectangle r (position.getRectangle (parentArea, layout));
const Rectangle<int> r (position.getRectangle (parentArea, layout));
const Drawable* const image = getDrawable();
@ -306,14 +306,12 @@ public:
if (image != 0 && getParentComponent() != 0)
{
const Rectangle parentArea (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> parentArea (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
Rectangle r (getCurrentBounds (parentArea));
Rectangle<int> r (getCurrentBounds (parentArea));
Rectangle<float> bounds (image->getBounds());
float x, y, w, h;
image->getBounds (x, y, w, h);
r.setSize ((int) (w + 1.0f), (int) (h + 1.0f));
r.setSize ((int) (bounds.getWidth() + 1.0f), (int) (bounds.getHeight() + 1.0f));
setCurrentBounds (r, parentArea, true);
}

49
extras/the jucer/src/model/paintelements/jucer_PaintElementPath.cpp
View file

@ -166,30 +166,29 @@ int PaintElementPath::getBorderSize() const
: 0;
}
const Rectangle PaintElementPath::getCurrentBounds (const Rectangle& parentArea) const
const Rectangle<int> PaintElementPath::getCurrentBounds (const Rectangle<int>& parentArea) const
{
updateStoredPath (getDocument()->getComponentLayout(), parentArea);
float x, y, w, h;
path.getBounds (x, y, w, h);
Rectangle<float> bounds (path.getBounds());
const int borderSize = getBorderSize();
return Rectangle ((int) x - borderSize,
(int) y - borderSize,
(int) w + borderSize * 2,
(int) h + borderSize * 2);
return Rectangle<int> ((int) bounds.getX() - borderSize,
(int) bounds.getY() - borderSize,
(int) bounds.getWidth() + borderSize * 2,
(int) bounds.getHeight() + borderSize * 2);
}
void PaintElementPath::setCurrentBounds (const Rectangle& b,
const Rectangle& parentArea,
void PaintElementPath::setCurrentBounds (const Rectangle<int>& b,
const Rectangle<int>& parentArea,
const bool undoable)
{
Rectangle newBounds (b);
Rectangle<int> newBounds (b);
newBounds.setSize (jmax (1, newBounds.getWidth()),
jmax (1, newBounds.getHeight()));
const Rectangle current (getCurrentBounds (parentArea));
const Rectangle<int> current (getCurrentBounds (parentArea));
if (newBounds != current)
{
@ -222,7 +221,7 @@ void PaintElementPath::setCurrentBounds (const Rectangle& b,
void PaintElementPath::rescalePoint (RelativePositionedRectangle& pos, int dx, int dy,
double scaleX, double scaleY,
double scaleStartX, double scaleStartY,
const Rectangle& parentArea) const
const Rectangle<int>& parentArea) const
{
double x, y, w, h;
pos.getRectangleDouble (x, y, w, h, parentArea, getDocument()->getComponentLayout());
@ -240,7 +239,7 @@ static void drawArrow (Graphics& g, float x1, float y1, float x2, float y2)
g.drawLine (x1 + (x2 - x1) * 0.49f, y1 + (y2 - y1) * 0.49f, x2, y2);
}
void PaintElementPath::draw (Graphics& g, const ComponentLayout* layout, const Rectangle& parentArea)
void PaintElementPath::draw (Graphics& g, const ComponentLayout* layout, const Rectangle<int>& parentArea)
{
updateStoredPath (layout, parentArea);
path.setUsingNonZeroWinding (nonZeroWinding);
@ -255,7 +254,7 @@ void PaintElementPath::draw (Graphics& g, const ComponentLayout* layout, const R
}
}
void PaintElementPath::drawExtraEditorGraphics (Graphics& g, const Rectangle& relativeTo)
void PaintElementPath::drawExtraEditorGraphics (Graphics& g, const Rectangle<int>& relativeTo)
{
ComponentLayout* layout = getDocument()->getComponentLayout();
@ -351,7 +350,7 @@ void PaintElementPath::mouseUp (const MouseEvent& e)
void PaintElementPath::changed()
{
ColouredElement::changed();
lastPathBounds = Rectangle();
lastPathBounds = Rectangle<int>();
}
void PaintElementPath::pointListChanged()
@ -687,7 +686,7 @@ void PaintElementPath::setToPath (const Path& p)
}
}
void PaintElementPath::updateStoredPath (const ComponentLayout* layout, const Rectangle& relativeTo) const
void PaintElementPath::updateStoredPath (const ComponentLayout* layout, const Rectangle<int>& relativeTo) const
{
if (lastPathBounds != relativeTo && ! relativeTo.isEmpty())
{
@ -889,7 +888,7 @@ PathPoint* PaintElementPath::addPoint (int pointIndexToAddItAfter, const bool un
double x1 = 20.0, y1 = 20.0, x2, y2;
ComponentLayout* layout = getDocument()->getComponentLayout();
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
if (points [pointIndexToAddItAfter] != 0)
positionToXY (points [pointIndexToAddItAfter]->pos [points [pointIndexToAddItAfter]->getNumPoints() - 1], x1, y1,
@ -1009,7 +1008,7 @@ void PaintElementPath::deletePoint (int pointIndex, const bool undoable)
}
//==============================================================================
bool PaintElementPath::getPoint (int index, int pointNumber, double& x, double& y, const Rectangle& parentArea) const
bool PaintElementPath::getPoint (int index, int pointNumber, double& x, double& y, const Rectangle<int>& parentArea) const
{
const PathPoint* const p = points [index];
@ -1028,7 +1027,7 @@ int PaintElementPath::findSegmentAtXY (int x, int y) const
double x1, y1, x2, y2, x3, y3, lastX = 0.0, lastY = 0.0, subPathStartX = 0.0, subPathStartY = 0.0;
ComponentLayout* const layout = getDocument()->getComponentLayout();
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
int subpathStartIndex = 0;
@ -1113,7 +1112,7 @@ int PaintElementPath::findSegmentAtXY (int x, int y) const
//==============================================================================
void PaintElementPath::movePoint (int index, int pointNumber,
double newX, double newY,
const Rectangle& parentArea,
const Rectangle<int>& parentArea,
const bool undoable)
{
PathPoint* const p = points [index];
@ -1242,7 +1241,7 @@ public:
break;
}
const Rectangle area (((PaintRoutineEditor*) owner->getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) owner->getParentComponent())->getComponentArea());
owner->getPoint (index)->changePointType (type, area, true);
}
@ -1436,7 +1435,7 @@ int PathPoint::getNumPoints() const
}
const PathPoint PathPoint::withChangedPointType (const Path::Iterator::PathElementType newType,
const Rectangle& parentArea) const
const Rectangle<int>& parentArea) const
{
PathPoint p (*this);
@ -1486,7 +1485,7 @@ const PathPoint PathPoint::withChangedPointType (const Path::Iterator::PathEleme
}
void PathPoint::changePointType (const Path::Iterator::PathElementType newType,
const Rectangle& parentArea, const bool undoable)
const Rectangle<int>& parentArea, const bool undoable)
{
if (newType != type)
{
@ -1584,7 +1583,7 @@ PathPointComponent::~PathPointComponent()
void PathPointComponent::updatePosition()
{
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
jassert (getParentComponent() != 0);
double x, y;
@ -1647,7 +1646,7 @@ void PathPointComponent::mouseDrag (const MouseEvent& e)
if (dragging)
{
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
int x = dragX + e.getDistanceFromDragStartX() - area.getX();
int y = dragY + e.getDistanceFromDragStartY() - area.getY();

22
extras/the jucer/src/model/paintelements/jucer_PaintElementPath.h
View file

@ -55,7 +55,7 @@ public:
int getNumPoints() const;
void changePointType (const Path::Iterator::PathElementType newType,
const Rectangle& parentArea,
const Rectangle<int>& parentArea,
const bool undoable);
void deleteFromPath();
@ -66,7 +66,7 @@ public:
private:
const PathPoint withChangedPointType (const Path::Iterator::PathElementType newType,
const Rectangle& parentArea) const;
const Rectangle<int>& parentArea) const;
};
@ -82,12 +82,12 @@ public:
//==============================================================================
void setInitialBounds (int parentWidth, int parentHeight);
const Rectangle getCurrentBounds (const Rectangle& parentArea) const;
void setCurrentBounds (const Rectangle& b, const Rectangle& parentArea, const bool undoable);
const Rectangle<int> getCurrentBounds (const Rectangle<int>& parentArea) const;
void setCurrentBounds (const Rectangle<int>& b, const Rectangle<int>& parentArea, const bool undoable);
//==============================================================================
bool getPoint (int index, int pointNumber, double& x, double& y, const Rectangle& parentArea) const;
void movePoint (int index, int pointNumber, double newX, double newY, const Rectangle& parentArea, const bool undoable);
bool getPoint (int index, int pointNumber, double& x, double& y, const Rectangle<int>& parentArea) const;
void movePoint (int index, int pointNumber, double newX, double newY, const Rectangle<int>& parentArea, const bool undoable);
const RelativePositionedRectangle getPoint (int index, int pointNumber) const;
void setPoint (int index, int pointNumber, const RelativePositionedRectangle& newPoint, const bool undoable);
@ -123,8 +123,8 @@ public:
void setToPath (const Path& p);
//==============================================================================
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle& parentArea);
void drawExtraEditorGraphics (Graphics& g, const Rectangle& relativeTo);
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle<int>& parentArea);
void drawExtraEditorGraphics (Graphics& g, const Rectangle<int>& relativeTo);
void resized();
void parentSizeChanged();
@ -145,19 +145,19 @@ private:
OwnedArray <PathPoint> points;
bool nonZeroWinding;
mutable Path path;
mutable Rectangle lastPathBounds;
mutable Rectangle<int> lastPathBounds;
int mouseDownOnSegment;
bool mouseDownSelectSegmentStatus;
const String pathToString() const;
void restorePathFromString (const String& s);
void updateStoredPath (const ComponentLayout* layout, const Rectangle& parentArea) const;
void updateStoredPath (const ComponentLayout* layout, const Rectangle<int>& parentArea) const;
int getBorderSize() const;
void rescalePoint (RelativePositionedRectangle& pos, int dx, int dy,
double scaleX, double scaleY,
double scaleStartX, double scaleStartY,
const Rectangle& parentArea) const;
const Rectangle<int>& parentArea) const;
};

10
extras/the jucer/src/model/paintelements/jucer_PaintElementRectangle.h
View file

@ -45,24 +45,24 @@ public:
{
}
const Rectangle getCurrentBounds (const Rectangle& parentArea) const
const Rectangle<int> getCurrentBounds (const Rectangle<int>& parentArea) const
{
return PaintElement::getCurrentBounds (parentArea); // bypass the ColouredElement implementation
}
void setCurrentBounds (const Rectangle& newBounds, const Rectangle& parentArea, const bool undoable)
void setCurrentBounds (const Rectangle<int>& newBounds, const Rectangle<int>& parentArea, const bool undoable)
{
PaintElement::setCurrentBounds (newBounds, parentArea, undoable); // bypass the ColouredElement implementation
}
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle& parentArea)
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle<int>& parentArea)
{
Component parentComponent;
parentComponent.setBounds (parentArea);
fillType.setFillType (g, getDocument(), parentArea);
const Rectangle r (position.getRectangle (parentArea, layout));
const Rectangle<int> r (position.getRectangle (parentArea, layout));
g.fillRect (r);
if (isStrokePresent)
@ -137,7 +137,7 @@ public:
void convertToPath()
{
const Rectangle r (getCurrentAbsoluteBounds());
const Rectangle<int> r (getCurrentAbsoluteBounds());
Path path;
path.addRectangle ((float) r.getX(), (float) r.getY(), (float) r.getWidth(), (float) r.getHeight());

2
extras/the jucer/src/model/paintelements/jucer_PaintElementRoundedRectangle.h
View file

@ -45,7 +45,7 @@ public:
~PaintElementRoundedRectangle() {}
//==============================================================================
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle& parentArea)
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle<int>& parentArea)
{
double x, y, w, h;
position.getRectangleDouble (x, y, w, h, parentArea, layout);

6
extras/the jucer/src/model/paintelements/jucer_PaintElementText.h
View file

@ -55,14 +55,14 @@ public:
}
//==============================================================================
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle& parentArea)
void draw (Graphics& g, const ComponentLayout* layout, const Rectangle<int>& parentArea)
{
fillType.setFillType (g, getDocument(), parentArea);
font = FontPropertyComponent::applyNameToFont (typefaceName, font);
g.setFont (font);
const Rectangle r (position.getRectangle (parentArea, layout));
const Rectangle<int> r (position.getRectangle (parentArea, layout));
g.drawText (replaceStringTranslations (text, owner->getDocument()),
r.getX(), r.getY(), r.getWidth(), r.getHeight(),
justification, true);
@ -338,7 +338,7 @@ public:
{
font = FontPropertyComponent::applyNameToFont (typefaceName, font);
const Rectangle r (getCurrentAbsoluteBounds());
const Rectangle<int> r (getCurrentAbsoluteBounds());
GlyphArrangement arr;
arr.addCurtailedLineOfText (font, text,

14
extras/the jucer/src/model/paintelements/jucer_PointComponent.h
View file

@ -55,9 +55,9 @@ public:
{
if (dynamic_cast <PaintRoutineEditor*> (getParentComponent()) != 0)
{
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle r (getPosition().getRectangle (area, owner->getDocument()->getComponentLayout()));
const Rectangle<int> r (getPosition().getRectangle (area, owner->getDocument()->getComponentLayout()));
setCentrePosition (r.getX(), r.getY());
}
@ -76,14 +76,14 @@ public:
//==============================================================================
void mouseDown (const MouseEvent& e)
{
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
dragX = getX() + getWidth() / 2 - area.getX();
dragY = getY() + getHeight() / 2 - area.getY();
}
void mouseDrag (const MouseEvent& e)
{
const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
const Rectangle<int> area (((PaintRoutineEditor*) getParentComponent())->getComponentArea());
int x = dragX + e.getDistanceFromDragStartX();
int y = dragY + e.getDistanceFromDragStartY();
@ -98,12 +98,12 @@ public:
const RelativePositionedRectangle original (getPosition());
RelativePositionedRectangle pr (original);
Rectangle r (pr.getRectangle (Rectangle (0, 0, area.getWidth(), area.getHeight()),
document->getComponentLayout()));
Rectangle<int> r (pr.getRectangle (Rectangle<int> (0, 0, area.getWidth(), area.getHeight()),
document->getComponentLayout()));
r.setPosition (x, y);
pr.updateFrom (r.getX(), r.getY(), r.getWidth(), r.getHeight(),
Rectangle (0, 0, area.getWidth(), area.getHeight()),
Rectangle<int> (0, 0, area.getWidth(), area.getHeight()),
document->getComponentLayout());
if (pr != original)

10
extras/the jucer/src/properties/jucer_PositionPropertyBase.h
View file

@ -340,7 +340,7 @@ public:
break;
}
Rectangle parentArea;
Rectangle<int> parentArea;
if (component->findParentComponentOfClass ((ComponentLayoutEditor*) 0) != 0)
{
@ -362,13 +362,13 @@ public:
PositionedRectangle whRect (p);
xyRect.setModes (xAnchor, xMode, yAnchor, yMode, sizeW, sizeH,
Rectangle (x, y, xw, yh));
Rectangle<int> (x, y, xw, yh));
whRect.setModes (xAnchor, xMode, yAnchor, yMode, sizeW, sizeH,
Rectangle (x, y, w, h));
Rectangle<int> (x, y, w, h));
p.setModes (xAnchor, xMode, yAnchor, yMode, sizeW, sizeH,
Rectangle (x, y, xw, yh));
Rectangle<int> (x, y, xw, yh));
p.setX (xyRect.getX());
p.setY (xyRect.getY());
@ -384,7 +384,7 @@ public:
void resized()
{
const Rectangle r (getLookAndFeel().getPropertyComponentContentPosition (*this));
const Rectangle<int> r (getLookAndFeel().getPropertyComponentContentPosition (*this));
button->changeWidthToFitText (r.getHeight());
button->setTopRightPosition (r.getRight(), r.getY());

28
extras/the jucer/src/ui/jucer_ComponentLayoutEditor.cpp
View file

@ -56,7 +56,7 @@ public:
if (background != 0)
{
background->fillWithBackground (g, false);
background->drawElements (g, Rectangle (0, 0, getWidth(), getHeight()));
background->drawElements (g, Rectangle<int> (0, 0, getWidth(), getHeight()));
}
grid.draw (g, background);
@ -80,9 +80,9 @@ public:
if (type != 0)
{
const Rectangle newBounds (type->getComponentPosition (comp)
.getRectangle (Rectangle (0, 0, getWidth(), getHeight()),
document.getComponentLayout()));
const Rectangle<int> newBounds (type->getComponentPosition (comp)
.getRectangle (Rectangle<int> (0, 0, getWidth(), getHeight()),
document.getComponentLayout()));
anyCompsMoved = anyCompsMoved || (comp->getBounds() != newBounds);
comp->setBounds (newBounds);
@ -167,27 +167,27 @@ void ComponentLayoutEditor::resized()
updateOverlayPositions();
}
const Rectangle ComponentLayoutEditor::getComponentArea() const
const Rectangle<int> ComponentLayoutEditor::getComponentArea() const
{
if (document.isFixedSize())
{
return Rectangle ((getWidth() - document.getInitialWidth()) / 2,
(getHeight() - document.getInitialHeight()) / 2,
document.getInitialWidth(),
document.getInitialHeight());
return Rectangle<int> ((getWidth() - document.getInitialWidth()) / 2,
(getHeight() - document.getInitialHeight()) / 2,
document.getInitialWidth(),
document.getInitialHeight());
}
else
{
return Rectangle (editorEdgeGap, editorEdgeGap,
getWidth() - editorEdgeGap * 2,
getHeight() - editorEdgeGap * 2);
return Rectangle<int> (editorEdgeGap, editorEdgeGap,
getWidth() - editorEdgeGap * 2,
getHeight() - editorEdgeGap * 2);
}
}
Image* ComponentLayoutEditor::createComponentLayerSnapshot() const
{
((SubComponentHolderComp*) subCompHolder)->dontFillBackground = true;
Image* const im = subCompHolder->createComponentSnapshot (Rectangle (0, 0, subCompHolder->getWidth(), subCompHolder->getHeight()));
Image* const im = subCompHolder->createComponentSnapshot (Rectangle<int> (0, 0, subCompHolder->getWidth(), subCompHolder->getHeight()));
((SubComponentHolderComp*) subCompHolder)->dontFillBackground = false;
return im;
@ -405,7 +405,7 @@ ComponentOverlayComponent* ComponentLayoutEditor::getOverlayCompFor (Component*
void ComponentLayoutEditor::findLassoItemsInArea (Array <Component*>& results,
int x, int y, int w, int h)
{
const Rectangle lasso (x - subCompHolder->getX(), y - subCompHolder->getY(), w, h);
const Rectangle<int> lasso (x - subCompHolder->getX(), y - subCompHolder->getY(), w, h);
for (int i = 0; i < subCompHolder->getNumChildComponents(); ++i)
{

2
extras/the jucer/src/ui/jucer_ComponentLayoutEditor.h
View file

@ -71,7 +71,7 @@ public:
ComponentOverlayComponent* getOverlayCompFor (Component* comp) const;
const Rectangle getComponentArea() const;
const Rectangle<int> getComponentArea() const;
Image* createComponentLayerSnapshot() const;

2
extras/the jucer/src/ui/jucer_ComponentLayoutPanel.cpp
View file

@ -115,7 +115,7 @@ void ComponentLayoutPanel::updatePropertiesList()
((LayoutPropsPanel*) propsPanel)->updateList();
}
const Rectangle ComponentLayoutPanel::getComponentArea() const
const Rectangle<int> ComponentLayoutPanel::getComponentArea() const
{
return ((ComponentLayoutEditor*) editor)->getComponentArea();
}

2
extras/the jucer/src/ui/jucer_ComponentLayoutPanel.h
View file

@ -43,7 +43,7 @@ public:
ComponentLayout& getLayout() const throw() { return layout;}
void updatePropertiesList();
const Rectangle getComponentArea() const;
const Rectangle<int> getComponentArea() const;
Image* createComponentSnapshot() const;

6
extras/the jucer/src/ui/jucer_ComponentOverlayComponent.cpp
View file

@ -180,8 +180,8 @@ void ComponentOverlayComponent::resizeEnd()
}
void ComponentOverlayComponent::checkBounds (int& x, int& y, int& w, int& h,
const Rectangle& previousBounds,
const Rectangle& limits,
const Rectangle<int>& previousBounds,
const Rectangle<int>& limits,
const bool isStretchingTop,
const bool isStretchingLeft,
const bool isStretchingBottom,
@ -234,7 +234,7 @@ void ComponentOverlayComponent::checkBounds (int& x, int& y, int& w, int& h,
void ComponentOverlayComponent::applyBoundsToComponent (Component* component, int x, int y, int w, int h)
{
if (component->getBounds() != Rectangle (x, y, w, h))
if (component->getBounds() != Rectangle<int> (x, y, w, h))
{
layout.getDocument()->getUndoManager().undoCurrentTransactionOnly();

4
extras/the jucer/src/ui/jucer_ComponentOverlayComponent.h
View file

@ -65,8 +65,8 @@ public:
void updateBoundsToMatchTarget();
void checkBounds (int& x, int& y, int& w, int& h,
const Rectangle& previousBounds,
const Rectangle& limits,
const Rectangle<int>& previousBounds,
const Rectangle<int>& limits,
const bool isStretchingTop,
const bool isStretchingLeft,
const bool isStretchingBottom,

2
extras/the jucer/src/ui/jucer_EditingPanelBase.h
View file

@ -53,7 +53,7 @@ public:
virtual void updatePropertiesList() = 0;
virtual const Rectangle getComponentArea() const = 0;
virtual const Rectangle<int> getComponentArea() const = 0;
double getZoom() const;
void setZoom (double newScale);

6
extras/the jucer/src/ui/jucer_JucerDocumentHolder.cpp
View file

@ -628,7 +628,7 @@ void JucerDocumentHolder::addElement (const int index)
if (panel != 0)
{
PaintRoutine* const currentPaintRoutine = & (panel->getPaintRoutine());
const Rectangle area (panel->getComponentArea());
const Rectangle<int> area (panel->getComponentArea());
document->getUndoManager().beginNewTransaction();
@ -648,7 +648,7 @@ void JucerDocumentHolder::addElement (const int index)
panel->xyToTargetXY (x, y);
Rectangle r (e->getCurrentBounds (area));
Rectangle<int> r (e->getCurrentBounds (area));
r.setPosition (x, y);
e->setCurrentBounds (r, area, true);
@ -669,7 +669,7 @@ void JucerDocumentHolder::addComponent (const int index)
if (panel != 0)
{
const Rectangle area (panel->getComponentArea());
const Rectangle<int> area (panel->getComponentArea());
document->getUndoManager().beginNewTransaction (T("Add new ") + ObjectTypes::componentTypeHandlers [index]->getTypeName());

24
extras/the jucer/src/ui/jucer_PaintRoutineEditor.cpp
View file

@ -68,27 +68,27 @@ void PaintRoutineEditor::removeAllElementComps()
}
}
const Rectangle PaintRoutineEditor::getComponentArea() const
const Rectangle<int> PaintRoutineEditor::getComponentArea() const
{
if (document.isFixedSize())
{
return Rectangle ((getWidth() - document.getInitialWidth()) / 2,
(getHeight() - document.getInitialHeight()) / 2,
document.getInitialWidth(),
document.getInitialHeight());
return Rectangle<int> ((getWidth() - document.getInitialWidth()) / 2,
(getHeight() - document.getInitialHeight()) / 2,
document.getInitialWidth(),
document.getInitialHeight());
}
else
{
return Rectangle (editorEdgeGap, editorEdgeGap,
getWidth() - editorEdgeGap * 2,
getHeight() - editorEdgeGap * 2);
return Rectangle<int> (editorEdgeGap, editorEdgeGap,
getWidth() - editorEdgeGap * 2,
getHeight() - editorEdgeGap * 2);
}
}
//==============================================================================
void PaintRoutineEditor::paint (Graphics& g)
{
const Rectangle clip (getComponentArea());
const Rectangle<int> clip (getComponentArea());
g.setOrigin (clip.getX(), clip.getY());
g.reduceClipRegion (0, 0, clip.getWidth(), clip.getHeight());
@ -104,7 +104,7 @@ void PaintRoutineEditor::paintOverChildren (Graphics& g)
if (componentOverlay != 0)
{
const Rectangle clip (getComponentArea());
const Rectangle<int> clip (getComponentArea());
g.drawImageAt (componentOverlay, clip.getX(), clip.getY());
}
}
@ -120,7 +120,7 @@ void PaintRoutineEditor::resized()
void PaintRoutineEditor::updateChildBounds()
{
const Rectangle clip (getComponentArea());
const Rectangle<int> clip (getComponentArea());
for (int i = 0; i < getNumChildComponents(); ++i)
{
@ -263,7 +263,7 @@ void PaintRoutineEditor::mouseUp (const MouseEvent& e)
void PaintRoutineEditor::findLassoItemsInArea (Array <PaintElement*>& results,
int x, int y, int w, int h)
{
const Rectangle lasso (x, y, w, h);
const Rectangle<int> lasso (x, y, w, h);
for (int i = 0; i < getNumChildComponents(); ++i)
{

2
extras/the jucer/src/ui/jucer_PaintRoutineEditor.h
View file

@ -66,7 +66,7 @@ public:
bool isInterestedInFileDrag (const StringArray& files);
void filesDropped (const StringArray& filenames, int x, int y);
const Rectangle getComponentArea() const;
const Rectangle<int> getComponentArea() const;
//==============================================================================
void refreshAllElements();

2
extras/the jucer/src/ui/jucer_PaintRoutinePanel.cpp
View file

@ -188,7 +188,7 @@ void PaintRoutinePanel::updatePropertiesList()
((GraphicsPropsPanel*) propsPanel)->updateList();
}
const Rectangle PaintRoutinePanel::getComponentArea() const
const Rectangle<int> PaintRoutinePanel::getComponentArea() const
{
return ((PaintRoutineEditor*) editor)->getComponentArea();
}

2
extras/the jucer/src/ui/jucer_PaintRoutinePanel.h
View file

@ -46,7 +46,7 @@ public:
PaintRoutine& getPaintRoutine() const throw() { return routine; }
void updatePropertiesList();
const Rectangle getComponentArea() const;
const Rectangle<int> getComponentArea() const;
//==============================================================================
juce_UseDebuggingNewOperator

46
extras/the jucer/src/utility/jucer_UtilityFunctions.cpp
View file

@ -333,7 +333,7 @@ const String positionToString (const RelativePositionedRectangle& pos)
void positionToXY (const RelativePositionedRectangle& position,
double& x, double& y,
const Rectangle& parentArea,
const Rectangle<int>& parentArea,
const ComponentLayout* layout)
{
double w, h;
@ -586,12 +586,12 @@ void drawResizableBorder (Graphics& g,
void drawMouseOverCorners (Graphics& g, int w, int h)
{
RectangleList r (Rectangle (0, 0, w, h));
r.subtract (Rectangle (1, 1, w - 2, h - 2));
RectangleList r (Rectangle<int> (0, 0, w, h));
r.subtract (Rectangle<int> (1, 1, w - 2, h - 2));
const int size = jmin (w / 3, h / 3, 12);
r.subtract (Rectangle (size, 0, w - size - size, h));
r.subtract (Rectangle (0, size, w, h - size - size));
r.subtract (Rectangle<int> (size, 0, w - size - size, h));
r.subtract (Rectangle<int> (0, size, w, h - size - size));
g.setColour (Colours::darkgrey);
@ -648,7 +648,7 @@ bool RelativePositionedRectangle::operator!= (const RelativePositionedRectangle&
return ! operator== (other);
}
void RelativePositionedRectangle::getRelativeTargetBounds (const Rectangle& parentArea,
void RelativePositionedRectangle::getRelativeTargetBounds (const Rectangle<int>& parentArea,
const ComponentLayout* layout,
int& x, int& xw, int& y, int& yh,
int& w, int& h) const
@ -674,44 +674,44 @@ void RelativePositionedRectangle::getRelativeTargetBounds (const Rectangle& pare
yh = ry != 0 ? ry->getHeight() : parentArea.getHeight();
}
const Rectangle RelativePositionedRectangle::getRectangle (const Rectangle& parentArea,
const ComponentLayout* layout) const
const Rectangle<int> RelativePositionedRectangle::getRectangle (const Rectangle<int>& parentArea,
const ComponentLayout* layout) const
{
int x, xw, y, yh, w, h;
getRelativeTargetBounds (parentArea, layout, x, xw, y, yh, w, h);
const Rectangle xyRect ((xw <= 0 || yh <= 0) ? Rectangle()
: rect.getRectangle (Rectangle (x, y, xw, yh)));
const Rectangle<int> xyRect ((xw <= 0 || yh <= 0) ? Rectangle<int>()
: rect.getRectangle (Rectangle<int> (x, y, xw, yh)));
const Rectangle whRect ((w <= 0 || h <= 0) ? Rectangle()
: rect.getRectangle (Rectangle (x, y, w, h)));
const Rectangle<int> whRect ((w <= 0 || h <= 0) ? Rectangle<int>()
: rect.getRectangle (Rectangle<int> (x, y, w, h)));
return Rectangle (xyRect.getX(), xyRect.getY(),
whRect.getWidth(), whRect.getHeight());
return Rectangle<int> (xyRect.getX(), xyRect.getY(),
whRect.getWidth(), whRect.getHeight());
}
void RelativePositionedRectangle::getRectangleDouble (double& x, double& y, double& w, double& h,
const Rectangle& parentArea,
const Rectangle<int>& parentArea,
const ComponentLayout* layout) const
{
int rx, rxw, ry, ryh, rw, rh;
getRelativeTargetBounds (parentArea, layout, rx, rxw, ry, ryh, rw, rh);
double dummy1, dummy2;
rect.getRectangleDouble (Rectangle (rx, ry, rxw, ryh), x, y, dummy1, dummy2);
rect.getRectangleDouble (Rectangle (rx, ry, rw, rh), dummy1, dummy2, w, h);
rect.getRectangleDouble (Rectangle<int> (rx, ry, rxw, ryh), x, y, dummy1, dummy2);
rect.getRectangleDouble (Rectangle<int> (rx, ry, rw, rh), dummy1, dummy2, w, h);
}
void RelativePositionedRectangle::updateFromComponent (const Component& comp,
const ComponentLayout* layout)
{
int x, xw, y, yh, w, h;
getRelativeTargetBounds (Rectangle (0, 0, comp.getParentWidth(), comp.getParentHeight()),
getRelativeTargetBounds (Rectangle<int> (0, 0, comp.getParentWidth(), comp.getParentHeight()),
layout, x, xw, y, yh, w, h);
PositionedRectangle xyRect (rect), whRect (rect);
xyRect.updateFrom (comp.getBounds(), Rectangle (x, y, xw, yh));
whRect.updateFrom (comp.getBounds(), Rectangle (x, y, w, h));
xyRect.updateFrom (comp.getBounds(), Rectangle<int> (x, y, xw, yh));
whRect.updateFrom (comp.getBounds(), Rectangle<int> (x, y, w, h));
rect.setX (xyRect.getX());
rect.setY (xyRect.getY());
@ -720,14 +720,14 @@ void RelativePositionedRectangle::updateFromComponent (const Component& comp,
}
void RelativePositionedRectangle::updateFrom (double newX, double newY, double newW, double newH,
const Rectangle& parentArea, const ComponentLayout* layout)
const Rectangle<int>& parentArea, const ComponentLayout* layout)
{
int x, xw, y, yh, w, h;
getRelativeTargetBounds (parentArea, layout, x, xw, y, yh, w, h);
PositionedRectangle xyRect (rect), whRect (rect);
xyRect.updateFromDouble (newX, newY, newW, newH, Rectangle (x, y, xw, yh));
whRect.updateFromDouble (newX, newY, newW, newH, Rectangle (x, y, w, h));
xyRect.updateFromDouble (newX, newY, newW, newH, Rectangle<int> (x, y, xw, yh));
whRect.updateFromDouble (newX, newY, newW, newH, Rectangle<int> (x, y, w, h));
rect.setX (xyRect.getX());
rect.setY (xyRect.getY());

10
extras/the jucer/src/utility/jucer_UtilityFunctions.h
View file

@ -48,17 +48,17 @@ struct RelativePositionedRectangle
bool operator== (const RelativePositionedRectangle& other) const throw();
bool operator!= (const RelativePositionedRectangle& other) const throw();
const Rectangle getRectangle (const Rectangle& parentArea, const ComponentLayout* layout) const;
const Rectangle<int> getRectangle (const Rectangle<int>& parentArea, const ComponentLayout* layout) const;
void getRectangleDouble (double& x, double& y, double& w, double& h,
const Rectangle& parentArea, const ComponentLayout* layout) const;
const Rectangle<int>& parentArea, const ComponentLayout* layout) const;
void updateFromComponent (const Component& comp, const ComponentLayout* layout);
void updateFrom (double newX, double newY, double newW, double newH,
const Rectangle& parentArea, const ComponentLayout* layout);
const Rectangle<int>& parentArea, const ComponentLayout* layout);
void applyToXml (XmlElement& e) const;
void restoreFromXml (const XmlElement& e, const RelativePositionedRectangle& defaultPos);
void getRelativeTargetBounds (const Rectangle& parentArea,
void getRelativeTargetBounds (const Rectangle<int>& parentArea,
const ComponentLayout* layout,
int& x, int& xw, int& y, int& yh, int& w, int& h) const;
};
@ -96,7 +96,7 @@ const String positionToString (const RelativePositionedRectangle& pos);
void positionToXY (const RelativePositionedRectangle& position,
double& x, double& y,
const Rectangle& parentArea,
const Rectangle<int>& parentArea,
const ComponentLayout* layout);
void positionToCode (const RelativePositionedRectangle& position,

1393
juce_amalgamated.cpp
View file

File diff suppressed because it is too large Load diff

628
juce_amalgamated.h
View file

File diff suppressed because it is too large Load diff

2
src/audio/audio_file_formats/juce_AudioThumbnail.cpp
View file

@ -500,7 +500,7 @@ void AudioThumbnail::drawChannel (Graphics& g,
const float midY = topY + h * 0.5f;
const float vscale = verticalZoomFactor * h / 256.0f;
const Rectangle clip (g.getClipBounds());
const Rectangle<int> clip (g.getClipBounds());
const int skipLeft = jlimit (0, w, clip.getX() - x);
w -= skipLeft;
x += skipLeft;

2
src/audio/plugins/formats/juce_VSTPluginFormat.cpp
View file

@ -1296,7 +1296,7 @@ public:
#if JUCE_LINUX
if (pluginWindow != 0)
{
const Rectangle clip (g.getClipBounds());
const Rectangle<int> clip (g.getClipBounds());
XEvent ev;
zerostruct (ev);

2
src/gui/components/buttons/juce_DrawableButton.cpp
View file

@ -140,7 +140,7 @@ void DrawableButton::paintButton (Graphics& g,
bool isMouseOverButton,
bool isButtonDown)
{
Rectangle imageSpace;
Rectangle<int> imageSpace;
if (style == ImageOnButtonBackground)
{

16
src/gui/components/buttons/juce_ShapeButton.cpp
View file

@ -77,19 +77,15 @@ void ShapeButton::setShape (const Path& newShape,
if (resizeNowToFitThisShape)
{
float x, y, w, h;
shape.getBounds (x, y, w, h);
shape.applyTransform (AffineTransform::translation (-x, -y));
Rectangle<float> bounds (shape.getBounds());
if (hasShadow)
{
w += 4.0f;
h += 4.0f;
shape.applyTransform (AffineTransform::translation (2.0f, 2.0f));
}
bounds.expand (4.0f, 4.0f);
setSize (1 + (int) (w + outlineWidth),
1 + (int) (h + outlineWidth));
shape.applyTransform (AffineTransform::translation (-bounds.getX(), -bounds.getY()));
setSize (1 + (int) (bounds.getWidth() + outlineWidth),
1 + (int) (bounds.getHeight() + outlineWidth));
}
}

2
src/gui/components/buttons/juce_ToolbarButton.cpp
View file

@ -83,7 +83,7 @@ void ToolbarButton::paintButtonArea (Graphics& g,
}
}
void ToolbarButton::contentAreaChanged (const Rectangle&)
void ToolbarButton::contentAreaChanged (const Rectangle<int>&)
{
}

2
src/gui/components/buttons/juce_ToolbarButton.h
View file

@ -76,7 +76,7 @@ public:
/** @internal */
void paintButtonArea (Graphics& g, int width, int height, bool isMouseOver, bool isMouseDown);
/** @internal */
void contentAreaChanged (const Rectangle& newBounds);
void contentAreaChanged (const Rectangle<int>& newBounds);
juce_UseDebuggingNewOperator

2
src/gui/components/code_editor/juce_CodeDocument.cpp
View file

@ -547,7 +547,7 @@ bool CodeDocument::writeToStream (OutputStream& stream)
String temp (lines.getUnchecked(i)->line); // use a copy to avoid bloating the memory footprint of the stored string.
const char* utf8 = temp.toUTF8();
if (! stream.write (utf8, strlen (utf8)))
if (! stream.write (utf8, (int) strlen (utf8)))
return false;
}

14
src/gui/components/code_editor/juce_CodeEditorComponent.cpp
View file

@ -63,7 +63,7 @@ public:
startTimer (400);
setVisible (true);
const Rectangle pos (owner.getCharacterBounds (owner.getCaretPos()));
const Rectangle<int> pos (owner.getCharacterBounds (owner.getCaretPos()));
setBounds (pos.getX(), pos.getY(), 2, pos.getHeight());
}
};
@ -388,7 +388,7 @@ void CodeEditorComponent::paint (Graphics& g)
const Colour defaultColour (findColour (CodeEditorComponent::defaultTextColourId));
const Colour highlightColour (findColour (CodeEditorComponent::highlightColourId));
const Rectangle clip (g.getClipBounds());
const Rectangle<int> clip (g.getClipBounds());
const int firstLineToDraw = jmax (0, clip.getY() / lineHeight);
const int lastLineToDraw = jmin (lines.size(), clip.getBottom() / lineHeight + 1);
@ -592,12 +592,12 @@ void CodeEditorComponent::scrollToKeepCaretOnScreen()
scrollToColumn (column);
}
const Rectangle CodeEditorComponent::getCharacterBounds (const CodeDocument::Position& pos) const throw()
const Rectangle<int> CodeEditorComponent::getCharacterBounds (const CodeDocument::Position& pos) const throw()
{
return Rectangle (roundToInt ((gutter - xOffset * charWidth) + indexToColumn (pos.getLineNumber(), pos.getIndexInLine()) * charWidth),
(pos.getLineNumber() - firstLineOnScreen) * lineHeight,
roundToInt (charWidth),
lineHeight);
return Rectangle<int> (roundToInt ((gutter - xOffset * charWidth) + indexToColumn (pos.getLineNumber(), pos.getIndexInLine()) * charWidth),
(pos.getLineNumber() - firstLineOnScreen) * lineHeight,
roundToInt (charWidth),
lineHeight);
}
const CodeDocument::Position CodeEditorComponent::getPositionAt (int x, int y)

2
src/gui/components/code_editor/juce_CodeEditorComponent.h
View file

@ -102,7 +102,7 @@ public:
/** Returns the on-screen position of a character in the document.
The rectangle returned is relative to this component's top-left origin.
*/
const Rectangle getCharacterBounds (const CodeDocument::Position& pos) const throw();
const Rectangle<int> getCharacterBounds (const CodeDocument::Position& pos) const throw();
/** Finds the character at a given on-screen position.
The co-ordinates are relative to this component's top-left origin.

18
src/gui/components/controls/juce_ListBox.cpp
View file

@ -654,8 +654,8 @@ int ListBox::getRowNumberOfComponent (Component* const rowComponent) const throw
return viewport->getRowNumberOfComponent (rowComponent);
}
const Rectangle ListBox::getRowPosition (const int rowNumber,
const bool relativeToComponentTopLeft) const throw()
const Rectangle<int> ListBox::getRowPosition (const int rowNumber,
const bool relativeToComponentTopLeft) const throw()
{
const int rowHeight = getRowHeight();
int y = viewport->getY() + rowHeight * rowNumber;
@ -663,8 +663,8 @@ const Rectangle ListBox::getRowPosition (const int rowNumber,
if (relativeToComponentTopLeft)
y -= viewport->getViewPositionY();
return Rectangle (viewport->getX(), y,
viewport->getViewedComponent()->getWidth(), rowHeight);
return Rectangle<int> (viewport->getX(), y,
viewport->getViewedComponent()->getWidth(), rowHeight);
}
void ListBox::setVerticalPosition (const double proportion)
@ -882,13 +882,13 @@ void ListBox::setHeaderComponent (Component* const newHeaderComponent)
void ListBox::repaintRow (const int rowNumber) throw()
{
const Rectangle r (getRowPosition (rowNumber, true));
const Rectangle<int> r (getRowPosition (rowNumber, true));
repaint (r.getX(), r.getY(), r.getWidth(), r.getHeight());
}
Image* ListBox::createSnapshotOfSelectedRows (int& imageX, int& imageY)
{
Rectangle imageArea;
Rectangle<int> imageArea;
const int firstRow = getRowContainingPosition (0, 0);
int i;
@ -901,7 +901,7 @@ Image* ListBox::createSnapshotOfSelectedRows (int& imageX, int& imageY)
int x = 0, y = 0;
rowComp->relativePositionToOtherComponent (this, x, y);
const Rectangle rowRect (x, y, rowComp->getWidth(), rowComp->getHeight());
const Rectangle<int> rowRect (x, y, rowComp->getWidth(), rowComp->getHeight());
if (imageArea.isEmpty())
imageArea = rowRect;
@ -910,7 +910,7 @@ Image* ListBox::createSnapshotOfSelectedRows (int& imageX, int& imageY)
}
}
imageArea = imageArea.getIntersection (Rectangle (0, 0, getWidth(), getHeight()));
imageArea = imageArea.getIntersection (Rectangle<int> (0, 0, getWidth(), getHeight()));
imageX = imageArea.getX();
imageY = imageArea.getY();
Image* snapshot = Image::createNativeImage (Image::ARGB, imageArea.getWidth(), imageArea.getHeight(), true);
@ -946,7 +946,7 @@ void ListBox::startDragAndDrop (const MouseEvent& e, const String& dragDescripti
dragImage->multiplyAllAlphas (0.6f);
MouseEvent e2 (e.getEventRelativeTo (this));
const Point p ((float) (x - e2.x), (float) (y - e2.y));
const Point<int> p (x - e2.x, y - e2.y);
dragContainer->startDragging (dragDescription, this, dragImage, true, &p);
}
else

4
src/gui/components/controls/juce_ListBox.h
View file

@ -401,8 +401,8 @@ public:
This may be off-screen, and the range of the row number that is passed-in is
not checked to see if it's a valid row.
*/
const Rectangle getRowPosition (const int rowNumber,
const bool relativeToComponentTopLeft) const throw();
const Rectangle<int> getRowPosition (const int rowNumber,
const bool relativeToComponentTopLeft) const throw();
/** Finds the row component for a given row in the list.

2
src/gui/components/controls/juce_Slider.cpp
View file

@ -938,7 +938,7 @@ void Slider::resized()
if (style == IncDecButtons)
{
Rectangle buttonRect (sliderRect);
Rectangle<int> buttonRect (sliderRect);
if (textBoxPos == TextBoxLeft || textBoxPos == TextBoxRight)
buttonRect.expand (-2, 0);

2
src/gui/components/controls/juce_Slider.h
View file

@ -763,7 +763,7 @@ private:
int sliderRegionStart, sliderRegionSize;
int sliderBeingDragged;
int pixelsForFullDragExtent;
Rectangle sliderRect;
Rectangle<int> sliderRect;
String textSuffix;
SliderStyle style;

10
src/gui/components/controls/juce_TableHeaderComponent.cpp
View file

@ -253,7 +253,7 @@ int TableHeaderComponent::getColumnIdOfIndex (int index, const bool onlyCountVis
return (ci != 0) ? ci->id : 0;
}
const Rectangle TableHeaderComponent::getColumnPosition (const int index) const
const Rectangle<int> TableHeaderComponent::getColumnPosition (const int index) const
{
int x = 0, width = 0, n = 0;
@ -274,7 +274,7 @@ const Rectangle TableHeaderComponent::getColumnPosition (const int index) const
}
}
return Rectangle (x, 0, width, getHeight());
return Rectangle<int> (x, 0, width, getHeight());
}
int TableHeaderComponent::getColumnIdAtX (const int xToFind) const
@ -537,7 +537,7 @@ void TableHeaderComponent::paint (Graphics& g)
lf.drawTableHeaderBackground (g, *this);
const Rectangle clip (g.getClipBounds());
const Rectangle<int> clip (g.getClipBounds());
int x = 0;
for (int i = 0; i < columns.size(); ++i)
@ -646,7 +646,7 @@ void TableHeaderComponent::mouseDrag (const MouseEvent& e)
if (columns.getUnchecked (i)->isVisible())
minWidthOnRight += columns.getUnchecked (i)->minimumWidth;
const Rectangle currentPos (getColumnPosition (getIndexOfColumnId (columnIdBeingResized, true)));
const Rectangle<int> currentPos (getColumnPosition (getIndexOfColumnId (columnIdBeingResized, true)));
w = jmax (ci->minimumWidth, jmin (w, getWidth() - minWidthOnRight - currentPos.getX()));
}
@ -740,7 +740,7 @@ void TableHeaderComponent::beginDrag (const MouseEvent& e)
{
draggingColumnOriginalIndex = getIndexOfColumnId (columnIdBeingDragged, true);
const Rectangle columnRect (getColumnPosition (draggingColumnOriginalIndex));
const Rectangle<int> columnRect (getColumnPosition (draggingColumnOriginalIndex));
const int temp = columnIdBeingDragged;
columnIdBeingDragged = 0;

2
src/gui/components/controls/juce_TableHeaderComponent.h
View file

@ -276,7 +276,7 @@ public:
ones are not counted). It returns a rectangle showing the position of the column relative
to this component's top-left. If the index is out-of-range, an empty rectangle is retrurned.
*/
const Rectangle getColumnPosition (const int index) const;
const Rectangle<int> getColumnPosition (const int index) const;
/** Finds the column ID at a given x-position in the component.

22
src/gui/components/controls/juce_TableListBox.cpp
View file

@ -71,7 +71,7 @@ public:
if (! columnsWithComponents [i])
{
const int columnId = header->getColumnIdOfIndex (i, true);
Rectangle columnRect (header->getColumnPosition (i));
Rectangle<int> columnRect (header->getColumnPosition (i));
columnRect.setSize (columnRect.getWidth(), getHeight());
g.saveState();
@ -125,7 +125,7 @@ public:
newComp->getProperties().set (tagPropertyName, newTag);
newComp->getProperties().set (tableColumnPropertyTag, columnId);
const Rectangle columnRect (header->getColumnPosition (i));
const Rectangle<int> columnRect (header->getColumnPosition (i));
newComp->setBounds (columnRect.getX(), 0, columnRect.getWidth(), getHeight());
columnsWithComponents.setBit (i);
@ -158,7 +158,7 @@ public:
if (columnId != 0)
{
const Rectangle columnRect (owner.getHeader()->getColumnPosition (owner.getHeader()->getIndexOfColumnId (columnId, true)));
const Rectangle<int> columnRect (owner.getHeader()->getColumnPosition (owner.getHeader()->getIndexOfColumnId (columnId, true)));
c->setBounds (columnRect.getX(), 0, columnRect.getWidth(), getHeight());
}
}
@ -380,19 +380,19 @@ bool TableListBox::isAutoSizeMenuOptionShown() const
return autoSizeOptionsShown;
}
const Rectangle TableListBox::getCellPosition (const int columnId,
const int rowNumber,
const bool relativeToComponentTopLeft) const
const Rectangle<int> TableListBox::getCellPosition (const int columnId,
const int rowNumber,
const bool relativeToComponentTopLeft) const
{
Rectangle headerCell (header->getColumnPosition (header->getIndexOfColumnId (columnId, true)));
Rectangle<int> headerCell (header->getColumnPosition (header->getIndexOfColumnId (columnId, true)));
if (relativeToComponentTopLeft)
headerCell.translate (header->getX(), 0);
const Rectangle row (getRowPosition (rowNumber, relativeToComponentTopLeft));
const Rectangle<int> row (getRowPosition (rowNumber, relativeToComponentTopLeft));
return Rectangle (headerCell.getX(), row.getY(),
headerCell.getWidth(), row.getHeight());
return Rectangle<int> (headerCell.getX(), row.getY(),
headerCell.getWidth(), row.getHeight());
}
void TableListBox::scrollToEnsureColumnIsOnscreen (const int columnId)
@ -401,7 +401,7 @@ void TableListBox::scrollToEnsureColumnIsOnscreen (const int columnId)
if (scrollbar != 0)
{
const Rectangle pos (header->getColumnPosition (header->getIndexOfColumnId (columnId, true)));
const Rectangle<int> pos (header->getColumnPosition (header->getIndexOfColumnId (columnId, true)));
double x = scrollbar->getCurrentRangeStart();
const double w = scrollbar->getCurrentRangeSize();

6
src/gui/components/controls/juce_TableListBox.h
View file

@ -269,9 +269,9 @@ public:
If relativeToComponentTopLeft is false, the co-ords are relative to the
top-left of the table's top-left cell.
*/
const Rectangle getCellPosition (const int columnId,
const int rowNumber,
const bool relativeToComponentTopLeft) const;
const Rectangle<int> getCellPosition (const int columnId,
const int rowNumber,
const bool relativeToComponentTopLeft) const;
/** Scrolls horizontally if necessary to make sure that a particular column is visible.

10
src/gui/components/controls/juce_TextEditor.cpp
View file

@ -1414,13 +1414,13 @@ void TextEditor::scrollEditorToPositionCaret (const int desiredCaretX,
viewport->setViewPosition (vx, vy);
}
const Rectangle TextEditor::getCaretRectangle()
const Rectangle<int> TextEditor::getCaretRectangle()
{
updateCaretPosition();
return Rectangle (roundToInt (cursorX) - viewport->getX(),
roundToInt (cursorY) - viewport->getY(),
1, roundToInt (cursorHeight));
return Rectangle<int> (roundToInt (cursorX) - viewport->getX(),
roundToInt (cursorY) - viewport->getY(),
1, roundToInt (cursorHeight));
}
//==============================================================================
@ -1677,7 +1677,7 @@ void TextEditor::drawContent (Graphics& g)
if (wordWrapWidth > 0)
{
g.setOrigin (leftIndent, topIndent);
const Rectangle clip (g.getClipBounds());
const Rectangle<int> clip (g.getClipBounds());
Colour selectedTextColour;
TextEditorIterator i (sections, wordWrapWidth, passwordCharacter);

2
src/gui/components/controls/juce_TextEditor.h
View file

@ -439,7 +439,7 @@ l */
The rectangle returned is relative to the component's top-left corner.
@see scrollEditorToPositionCaret
*/
const Rectangle getCaretRectangle();
const Rectangle<int> getCaretRectangle();
/** Selects a section of the text.
*/

12
src/gui/components/controls/juce_Toolbar.cpp
View file

@ -84,7 +84,7 @@ public:
{
}
void contentAreaChanged (const Rectangle&)
void contentAreaChanged (const Rectangle<int>&)
{
}
@ -544,7 +544,7 @@ void Toolbar::updateAllItemPositions (const bool animate)
{
const int size = (int) resizer.getItemSize (activeIndex++);
Rectangle newBounds;
Rectangle<int> newBounds;
if (vertical)
newBounds.setBounds (0, pos, getWidth(), size);
else
@ -644,12 +644,12 @@ void Toolbar::itemDragMove (const String&, Component* sourceComponent, int x, in
const int dragObjectLeft = vertical ? (y - tc->dragOffsetY) : (x - tc->dragOffsetX);
const int dragObjectRight = dragObjectLeft + (vertical ? tc->getHeight() : tc->getWidth());
const Rectangle current (animator.getComponentDestination (getChildComponent (newIndex)));
const Rectangle<int> current (animator.getComponentDestination (getChildComponent (newIndex)));
ToolbarItemComponent* const prev = getNextActiveComponent (newIndex, -1);
if (prev != 0)
{
const Rectangle previousPos (animator.getComponentDestination (prev));
const Rectangle<int> previousPos (animator.getComponentDestination (prev));
if (abs (dragObjectLeft - (vertical ? previousPos.getY() : previousPos.getX())
< abs (dragObjectRight - (vertical ? current.getBottom() : current.getRight()))))
@ -661,7 +661,7 @@ void Toolbar::itemDragMove (const String&, Component* sourceComponent, int x, in
ToolbarItemComponent* const next = getNextActiveComponent (newIndex, 1);
if (next != 0)
{
const Rectangle nextPos (animator.getComponentDestination (next));
const Rectangle<int> nextPos (animator.getComponentDestination (next));
if (abs (dragObjectLeft - (vertical ? current.getY() : current.getX())
> abs (dragObjectRight - (vertical ? nextPos.getBottom() : nextPos.getRight()))))
@ -749,7 +749,7 @@ public:
void positionNearBar()
{
const Rectangle screenSize (toolbar->getParentMonitorArea());
const Rectangle<int> screenSize (toolbar->getParentMonitorArea());
const int tbx = toolbar->getScreenX();
const int tby = toolbar->getScreenY();
const int gap = 8;

10
src/gui/components/controls/juce_ToolbarItemComponent.cpp
View file

@ -231,14 +231,14 @@ void ToolbarItemComponent::resized()
const int indent = jmin (proportionOfWidth (0.08f),
proportionOfHeight (0.08f));
contentArea = Rectangle (indent, indent,
getWidth() - indent * 2,
toolbarStyle == Toolbar::iconsWithText ? proportionOfHeight (0.55f)
: (getHeight() - indent * 2));
contentArea = Rectangle<int> (indent, indent,
getWidth() - indent * 2,
toolbarStyle == Toolbar::iconsWithText ? proportionOfHeight (0.55f)
: (getHeight() - indent * 2));
}
else
{
contentArea = Rectangle();
contentArea = Rectangle<int>();
}
contentAreaChanged (contentArea);

6
src/gui/components/controls/juce_ToolbarItemComponent.h
View file

@ -110,7 +110,7 @@ public:
@see contentAreaChanged
*/
const Rectangle getContentArea() const throw() { return contentArea; }
const Rectangle<int> getContentArea() const throw() { return contentArea; }
//==============================================================================
/** This method must return the size criteria for this item, based on a given toolbar
@ -155,7 +155,7 @@ public:
See getContentArea() for a description of what the area is.
*/
virtual void contentAreaChanged (const Rectangle& newBounds) = 0;
virtual void contentAreaChanged (const Rectangle<int>& newBounds) = 0;
//==============================================================================
@ -203,7 +203,7 @@ private:
ScopedPointer <Component> overlayComp;
int dragOffsetX, dragOffsetY;
bool isActive, isBeingDragged, isBeingUsedAsAButton;
Rectangle contentArea;
Rectangle<int> contentArea;
ToolbarItemComponent (const ToolbarItemComponent&);
const ToolbarItemComponent& operator= (const ToolbarItemComponent&);

38
src/gui/components/controls/juce_TreeView.cpp
View file

@ -58,7 +58,7 @@ public:
isDragging = false;
needSelectionOnMouseUp = false;
Rectangle pos;
Rectangle<int> pos;
TreeViewItem* const item = findItemAt (e.y, pos);
if (item == 0)
@ -98,7 +98,7 @@ public:
if (needSelectionOnMouseUp && e.mouseWasClicked())
{
Rectangle pos;
Rectangle<int> pos;
TreeViewItem* const item = findItemAt (e.y, pos);
if (item != 0)
@ -110,7 +110,7 @@ public:
{
if (e.getNumberOfClicks() != 3) // ignore triple clicks
{
Rectangle pos;
Rectangle<int> pos;
TreeViewItem* const item = findItemAt (e.y, pos);
if (item != 0 && (e.x >= pos.getX() || ! owner->openCloseButtonsVisible))
@ -132,7 +132,7 @@ public:
{
isDragging = true;
Rectangle pos;
Rectangle<int> pos;
TreeViewItem* const item = findItemAt (e.getMouseDownY(), pos);
if (item != 0 && e.getMouseDownX() >= pos.getX())
@ -150,7 +150,7 @@ public:
Image* dragImage = Component::createComponentSnapshot (pos, true);
dragImage->multiplyAllAlphas (0.6f);
Point imageOffset ((float) (pos.getX() - e.x), (float) (pos.getY() - e.y));
Point<int> imageOffset (pos.getX() - e.x, pos.getY() - e.y);
dragContainer->startDragging (dragDescription, owner, dragImage, true, &imageOffset);
}
else
@ -175,7 +175,7 @@ public:
}
void paint (Graphics& g);
TreeViewItem* findItemAt (int y, Rectangle& itemPosition) const;
TreeViewItem* findItemAt (int y, Rectangle<int>& itemPosition) const;
void updateComponents()
{
@ -228,7 +228,7 @@ public:
{
const TreeViewItem* const item = (TreeViewItem*) rowComponentItems.getUnchecked(i);
Rectangle pos (item->getItemPosition (false));
Rectangle<int> pos (item->getItemPosition (false));
pos.setSize (pos.getWidth(), item->itemHeight);
if (pos.getBottom() >= visibleTop && pos.getY() < visibleBottom)
@ -264,7 +264,7 @@ public:
if (owner->openCloseButtonsVisible)
{
Rectangle pos;
Rectangle<int> pos;
TreeViewItem* item = findItemAt (e.y, pos);
if (item != 0 && e.x < pos.getX() && e.x >= pos.getX() - owner->getIndentSize())
@ -280,7 +280,7 @@ public:
{
if (buttonUnderMouse != 0 && containsItem (buttonUnderMouse))
{
const Rectangle r (buttonUnderMouse->getItemPosition (false));
const Rectangle<int> r (buttonUnderMouse->getItemPosition (false));
repaint (0, r.getY(), r.getX(), buttonUnderMouse->getItemHeight());
}
@ -288,7 +288,7 @@ public:
if (buttonUnderMouse != 0)
{
const Rectangle r (buttonUnderMouse->getItemPosition (false));
const Rectangle<int> r (buttonUnderMouse->getItemPosition (false));
repaint (0, r.getY(), r.getX(), buttonUnderMouse->getItemHeight());
}
}
@ -308,7 +308,7 @@ public:
{
int x, y;
getMouseXYRelative (x, y);
Rectangle pos;
Rectangle<int> pos;
TreeViewItem* const item = findItemAt (y, pos);
@ -559,7 +559,7 @@ TreeViewItem* TreeView::getItemAt (int y) const throw()
TreeViewContentComponent* const tc = (TreeViewContentComponent*) viewport->getViewedComponent();
int x;
relativePositionToOtherComponent (tc, x, y);
Rectangle pos;
Rectangle<int> pos;
return tc->findItemAt (y, pos);
}
@ -852,7 +852,7 @@ public:
void setTargetPosition (TreeViewItem* const item) throw()
{
Rectangle r (item->getItemPosition (true));
Rectangle<int> r (item->getItemPosition (true));
r.setHeight (item->getItemHeight());
setBounds (r);
}
@ -898,7 +898,7 @@ TreeViewItem* TreeView::getInsertPosition (int& x, int& y, int& insertIndex,
if (item == 0)
return 0;
Rectangle itemPos (item->getItemPosition (true));
Rectangle<int> itemPos (item->getItemPosition (true));
insertIndex = item->getIndexInParent();
const int oldY = y;
y = itemPos.getY();
@ -1055,7 +1055,7 @@ void TreeViewContentComponent::paint (Graphics& g)
}
}
TreeViewItem* TreeViewContentComponent::findItemAt (int y, Rectangle& itemPosition) const
TreeViewItem* TreeViewContentComponent::findItemAt (int y, Rectangle<int>& itemPosition) const
{
if (owner->rootItem != 0)
{
@ -1290,7 +1290,7 @@ void TreeViewItem::itemDropped (const String& /*sourceDescription*/, Component*
{
}
const Rectangle TreeViewItem::getItemPosition (const bool relativeToTreeViewTopLeft) const throw()
const Rectangle<int> TreeViewItem::getItemPosition (const bool relativeToTreeViewTopLeft) const throw()
{
const int indentX = getIndentX();
@ -1299,7 +1299,7 @@ const Rectangle TreeViewItem::getItemPosition (const bool relativeToTreeViewTopL
if (ownerView != 0 && width < 0)
width = ownerView->viewport->getViewWidth() - indentX;
Rectangle r (indentX, y, jmax (0, width), totalHeight);
Rectangle<int> r (indentX, y, jmax (0, width), totalHeight);
if (relativeToTreeViewTopLeft)
r.setPosition (r.getX() - ownerView->viewport->getViewPositionX(),
@ -1318,7 +1318,7 @@ void TreeViewItem::repaintItem() const
{
if (ownerView != 0 && areAllParentsOpen())
{
const Rectangle r (getItemPosition (true));
const Rectangle<int> r (getItemPosition (true));
ownerView->viewport->repaint (0, r.getY(), r.getRight(), r.getHeight());
}
}
@ -1485,7 +1485,7 @@ void TreeViewItem::paintRecursively (Graphics& g, int width)
if (isOpen())
{
const Rectangle clip (g.getClipBounds());
const Rectangle<int> clip (g.getClipBounds());
for (int i = 0; i < subItems.size(); ++i)
{

2
src/gui/components/controls/juce_TreeView.h
View file

@ -139,7 +139,7 @@ public:
the tree. If false, it is relative to the top-left of the topmost item in the
tree (so this would be unaffected by scrolling the view).
*/
const Rectangle getItemPosition (const bool relativeToTreeViewTopLeft) const throw();
const Rectangle<int> getItemPosition (const bool relativeToTreeViewTopLeft) const throw();
/** Sends a signal to the treeview to make it refresh itself.

44
src/gui/components/juce_Component.cpp
View file

@ -264,7 +264,7 @@ public:
alpha (1.0f),
scale (1.0f)
{
image = comp->createComponentSnapshot (Rectangle (0, 0, comp->getWidth(), comp->getHeight()));
image = comp->createComponentSnapshot (Rectangle<int> (0, 0, comp->getWidth(), comp->getHeight()));
setBounds (comp->getBounds());
comp->getParentComponent()->addAndMakeVisible (this);
toBehind (comp);
@ -418,7 +418,7 @@ void Component::addToDesktop (int styleWanted, void* nativeWindowToAttachTo)
bool wasFullscreen = false;
bool wasMinimised = false;
ComponentBoundsConstrainer* currentConstainer = 0;
Rectangle oldNonFullScreenBounds;
Rectangle<int> oldNonFullScreenBounds;
if (peer != 0)
{
@ -928,7 +928,7 @@ void Component::setTopRightPosition (const int x, const int y)
setTopLeftPosition (x - getWidth(), y);
}
void Component::setBounds (const Rectangle& r)
void Component::setBounds (const Rectangle<int>& r)
{
setBounds (r.getX(),
r.getY(),
@ -1777,13 +1777,13 @@ void Component::paintEntireComponent (Graphics& originalContext)
}
//==============================================================================
Image* Component::createComponentSnapshot (const Rectangle& areaToGrab,
Image* Component::createComponentSnapshot (const Rectangle<int>& areaToGrab,
const bool clipImageToComponentBounds)
{
Rectangle r (areaToGrab);
Rectangle<int> r (areaToGrab);
if (clipImageToComponentBounds)
r = r.getIntersection (Rectangle (0, 0, getWidth(), getHeight()));
r = r.getIntersection (Rectangle<int> (0, 0, getWidth(), getHeight()));
Image* const componentImage = Image::createNativeImage (flags.opaqueFlag ? Image::RGB : Image::ARGB,
jmax (1, r.getWidth()),
@ -1922,7 +1922,7 @@ void Component::colourChanged()
}
//==============================================================================
const Rectangle Component::getUnclippedArea() const
const Rectangle<int> Component::getUnclippedArea() const
{
int x = 0, y = 0, w = getWidth(), h = getHeight();
@ -1932,18 +1932,18 @@ const Rectangle Component::getUnclippedArea() const
while (p != 0)
{
if (! Rectangle::intersectRectangles (x, y, w, h, -px, -py, p->getWidth(), p->getHeight()))
return Rectangle();
if (! Rectangle<int>::intersectRectangles (x, y, w, h, -px, -py, p->getWidth(), p->getHeight()))
return Rectangle<int>();
px += p->getX();
py += p->getY();
p = p->parentComponent_;
}
return Rectangle (x, y, w, h);
return Rectangle<int> (x, y, w, h);
}
void Component::clipObscuredRegions (Graphics& g, const Rectangle& clipRect,
void Component::clipObscuredRegions (Graphics& g, const Rectangle<int>& clipRect,
const int deltaX, const int deltaY) const throw()
{
for (int i = childComponentList_.size(); --i >= 0;)
@ -1952,7 +1952,7 @@ void Component::clipObscuredRegions (Graphics& g, const Rectangle& clipRect,
if (c->isVisible())
{
Rectangle newClip (clipRect.getIntersection (c->bounds_));
Rectangle<int> newClip (clipRect.getIntersection (c->bounds_));
if (! newClip.isEmpty())
{
@ -1979,7 +1979,7 @@ void Component::getVisibleArea (RectangleList& result,
const bool includeSiblings) const
{
result.clear();
const Rectangle unclipped (getUnclippedArea());
const Rectangle<int> unclipped (getUnclippedArea());
if (! unclipped.isEmpty())
{
@ -1993,7 +1993,7 @@ void Component::getVisibleArea (RectangleList& result,
c->relativePositionToOtherComponent (this, x, y);
c->subtractObscuredRegions (result, x, y,
Rectangle (0, 0, c->getWidth(), c->getHeight()),
Rectangle<int> (0, 0, c->getWidth(), c->getHeight()),
this);
}
@ -2005,7 +2005,7 @@ void Component::getVisibleArea (RectangleList& result,
void Component::subtractObscuredRegions (RectangleList& result,
const int deltaX,
const int deltaY,
const Rectangle& clipRect,
const Rectangle<int>& clipRect,
const Component* const compToAvoid) const throw()
{
for (int i = childComponentList_.size(); --i >= 0;)
@ -2016,14 +2016,14 @@ void Component::subtractObscuredRegions (RectangleList& result,
{
if (c->isOpaque())
{
Rectangle childBounds (c->bounds_.getIntersection (clipRect));
Rectangle<int> childBounds (c->bounds_.getIntersection (clipRect));
childBounds.translate (deltaX, deltaY);
result.subtract (childBounds);
}
else
{
Rectangle newClip (clipRect.getIntersection (c->bounds_));
Rectangle<int> newClip (clipRect.getIntersection (c->bounds_));
newClip.translate (-c->getX(), -c->getY());
c->subtractObscuredRegions (result,
@ -2453,7 +2453,7 @@ void Component::internalMouseDown (const int x, const int y, const int64 time)
int gx = x, gy = y;
relativePositionToGlobal (gx, gy);
desktop.registerMouseDown (gx, gy, time, this);
desktop.registerMouseDown (Point<int> (gx, gy), time, this);
const ComponentDeletionWatcher deletionChecker (this);
@ -2596,7 +2596,7 @@ void Component::internalMouseUp (const int oldModifiers, int x, int y, const int
int gx = x, gy = y;
relativePositionToGlobal (gx, gy);
desktop.registerMouseDrag (gx, gy);
desktop.registerMouseDrag (Point<int> (gx, gy));
const ComponentDeletionWatcher deletionChecker (this);
@ -2738,7 +2738,7 @@ void Component::internalMouseDrag (int x, int y, const int64 time)
int gx = x, gy = y;
relativePositionToGlobal (gx, gy);
desktop.registerMouseDrag (gx, gy);
desktop.registerMouseDrag (Point<int> (gx, gy));
const ComponentDeletionWatcher deletionChecker (this);
@ -2811,7 +2811,7 @@ void Component::internalMouseDrag (int x, int y, const int64 time)
{
if (isUnboundedMouseModeOn)
{
Rectangle screenArea (getParentMonitorArea().expanded (-2, -2));
Rectangle<int> screenArea (getParentMonitorArea().expanded (-2, -2));
int mx, my;
Desktop::getMousePosition (mx, my);
@ -3451,7 +3451,7 @@ Component* JUCE_CALLTYPE Component::getComponentUnderMouse() throw()
}
//==============================================================================
const Rectangle Component::getParentMonitorArea() const throw()
const Rectangle<int> Component::getParentMonitorArea() const throw()
{
int centreX = getWidth() / 2;
int centreY = getHeight() / 2;

19
src/gui/components/juce_Component.h
View file

@ -312,6 +312,9 @@ public:
*/
int getRight() const throw() { return bounds_.getRight(); }
/** Returns the component's top-left position as a Point. */
const Point<int> getPosition() const throw() { return bounds_.getPosition(); }
/** Returns the y co-ordinate of the bottom edge of this component.
This is a distance in pixels from the top edge of the component's parent.
@ -322,7 +325,7 @@ public:
The rectangle returned is relative to the top-left of the component's parent.
*/
const Rectangle& getBounds() const throw() { return bounds_; }
const Rectangle<int>& getBounds() const throw() { return bounds_; }
/** Returns the region of this component that's not obscured by other, opaque components.
@ -411,7 +414,7 @@ public:
@see setBounds
*/
void setBounds (const Rectangle& newBounds);
void setBounds (const Rectangle<int>& newBounds);
/** Changes the component's position and size in terms of fractions of its parent's size.
@ -501,7 +504,7 @@ public:
monitors, it will return the area of the monitor that contains the component's
centre.
*/
const Rectangle getParentMonitorArea() const throw();
const Rectangle<int> getParentMonitorArea() const throw();
//==============================================================================
/** Returns the number of child components that this component contains.
@ -835,7 +838,7 @@ public:
@see paintEntireComponent
*/
Image* createComponentSnapshot (const Rectangle& areaToGrab,
Image* createComponentSnapshot (const Rectangle<int>& areaToGrab,
const bool clipImageToComponentBounds = true);
/** Draws this component and all its subcomponents onto the specified graphics
@ -1907,7 +1910,7 @@ private:
String componentName_;
Component* parentComponent_;
uint32 componentUID;
Rectangle bounds_;
Rectangle<int> bounds_;
int numDeepMouseListeners;
Array <Component*> childComponentList_;
LookAndFeel* lookAndFeel_;
@ -1978,13 +1981,13 @@ private:
static void bringModalComponentToFront();
void subtractObscuredRegions (RectangleList& result,
const int deltaX, const int deltaY,
const Rectangle& clipRect,
const Rectangle<int>& clipRect,
const Component* const compToAvoid) const throw();
void clipObscuredRegions (Graphics& g, const Rectangle& clipRect,
void clipObscuredRegions (Graphics& g, const Rectangle<int>& clipRect,
const int deltaX, const int deltaY) const throw();
// how much of the component is not off the edges of its parents
const Rectangle getUnclippedArea() const;
const Rectangle<int> getUnclippedArea() const;
void sendVisibilityChangeMessage();
//==============================================================================

35
src/gui/components/juce_Desktop.cpp
View file

@ -65,13 +65,13 @@ Desktop& JUCE_CALLTYPE Desktop::getInstance() throw()
Desktop* Desktop::instance = 0;
//==============================================================================
extern void juce_updateMultiMonitorInfo (Array <Rectangle>& monitorCoords,
extern void juce_updateMultiMonitorInfo (Array <Rectangle<int> >& monitorCoords,
const bool clipToWorkArea);
void Desktop::refreshMonitorSizes() throw()
{
const Array <Rectangle> oldClipped (monitorCoordsClipped);
const Array <Rectangle> oldUnclipped (monitorCoordsUnclipped);
const Array <Rectangle<int> > oldClipped (monitorCoordsClipped);
const Array <Rectangle<int> > oldUnclipped (monitorCoordsUnclipped);
monitorCoordsClipped.clear();
monitorCoordsUnclipped.clear();
@ -97,7 +97,7 @@ int Desktop::getNumDisplayMonitors() const throw()
return monitorCoordsClipped.size();
}
const Rectangle Desktop::getDisplayMonitorCoordinates (const int index, const bool clippedToWorkArea) const throw()
const Rectangle<int> Desktop::getDisplayMonitorCoordinates (const int index, const bool clippedToWorkArea) const throw()
{
return clippedToWorkArea ? monitorCoordsClipped [index]
: monitorCoordsUnclipped [index];
@ -113,19 +113,19 @@ const RectangleList Desktop::getAllMonitorDisplayAreas (const bool clippedToWork
return rl;
}
const Rectangle Desktop::getMainMonitorArea (const bool clippedToWorkArea) const throw()
const Rectangle<int> Desktop::getMainMonitorArea (const bool clippedToWorkArea) const throw()
{
return getDisplayMonitorCoordinates (0, clippedToWorkArea);
}
const Rectangle Desktop::getMonitorAreaContaining (int cx, int cy, const bool clippedToWorkArea) const throw()
const Rectangle<int> Desktop::getMonitorAreaContaining (int cx, int cy, const bool clippedToWorkArea) const throw()
{
Rectangle best (getMainMonitorArea (clippedToWorkArea));
Rectangle<int> best (getMainMonitorArea (clippedToWorkArea));
double bestDistance = 1.0e10;
for (int i = getNumDisplayMonitors(); --i >= 0;)
{
const Rectangle rect (getDisplayMonitorCoordinates (i, clippedToWorkArea));
const Rectangle<int> rect (getDisplayMonitorCoordinates (i, clippedToWorkArea));
if (rect.contains (cx, cy))
return rect;
@ -211,8 +211,8 @@ void Desktop::componentBroughtToFront (Component* const c) throw()
void Desktop::getLastMouseDownPosition (int& x, int& y) throw()
{
const Desktop& d = getInstance();
x = d.mouseDowns[0].x;
y = d.mouseDowns[0].y;
x = d.mouseDowns[0].position.getX();
y = d.mouseDowns[0].position.getY();
}
int Desktop::getMouseButtonClickCounter() throw()
@ -230,24 +230,23 @@ const Time Desktop::getLastMouseDownTime() const throw()
return Time (mouseDowns[0].time);
}
void Desktop::registerMouseDown (int x, int y, int64 time, Component* component) throw()
void Desktop::registerMouseDown (const Point<int>& position, int64 time, Component* component) throw()
{
for (int i = numElementsInArray (mouseDowns); --i > 0;)
mouseDowns[i] = mouseDowns[i - 1];
mouseDowns[0].x = x;
mouseDowns[0].y = y;
mouseDowns[0].position = position;
mouseDowns[0].time = time;
mouseDowns[0].component = component;
mouseMovedSignificantlySincePressed = false;
}
void Desktop::registerMouseDrag (int x, int y) throw()
void Desktop::registerMouseDrag (const Point<int>& position) throw()
{
mouseMovedSignificantlySincePressed
= mouseMovedSignificantlySincePressed
|| abs (mouseDowns[0].x - x) >= 4
|| abs (mouseDowns[0].y - y) >= 4;
|| abs (mouseDowns[0].position.getX() - position.getX()) >= 4
|| abs (mouseDowns[0].position.getY() - position.getY()) >= 4;
}
int Desktop::getNumberOfMultipleClicks() const throw()
@ -263,8 +262,8 @@ int Desktop::getNumberOfMultipleClicks() const throw()
{
if (mouseDowns[0].time - mouseDowns[i].time
< (int) (MouseEvent::getDoubleClickTimeout() * (1.0 + 0.25 * (i - 1)))
&& abs (mouseDowns[0].x - mouseDowns[i].x) < 8
&& abs (mouseDowns[0].y - mouseDowns[i].y) < 8
&& abs (mouseDowns[0].position.getX() - mouseDowns[i].position.getX()) < 8
&& abs (mouseDowns[0].position.getY() - mouseDowns[i].position.getY()) < 8
&& mouseDowns[0].component == mouseDowns[i].component)
{
++numClicks;

16
src/gui/components/juce_Desktop.h
View file

@ -81,7 +81,7 @@ public:
If clippedToWorkArea is true, it will exclude any areas like the taskbar on Windows,
or the menu bar on Mac. If clippedToWorkArea is false, the entire monitor area is returned.
*/
const Rectangle getMainMonitorArea (const bool clippedToWorkArea = true) const throw();
const Rectangle<int> getMainMonitorArea (const bool clippedToWorkArea = true) const throw();
/** Returns the position and size of the monitor which contains this co-ordinate.
@ -91,7 +91,7 @@ public:
If clippedToWorkArea is true, it will exclude any areas like the taskbar on Windows,
or the menu bar on Mac. If clippedToWorkArea is false, the entire monitor area is returned.
*/
const Rectangle getMonitorAreaContaining (int x, int y, const bool clippedToWorkArea = true) const throw();
const Rectangle<int> getMonitorAreaContaining (int x, int y, const bool clippedToWorkArea = true) const throw();
//==============================================================================
@ -249,14 +249,14 @@ private:
Desktop() throw();
~Desktop() throw();
Array <Rectangle> monitorCoordsClipped, monitorCoordsUnclipped;
Array <Rectangle<int> > monitorCoordsClipped, monitorCoordsUnclipped;
int lastFakeMouseMoveX, lastFakeMouseMoveY, mouseClickCounter;
bool mouseMovedSignificantlySincePressed;
struct RecentMouseDown
{
int x, y;
Point<int> position;
int64 time;
Component* component;
};
@ -264,20 +264,20 @@ private:
RecentMouseDown mouseDowns[4];
void incrementMouseClickCounter() throw();
void registerMouseDown (int x, int y, int64 time, Component* component) throw();
void registerMouseDrag (int x, int y) throw();
void registerMouseDown (const Point<int>& position, int64 time, Component* component) throw();
void registerMouseDrag (const Point<int>& position) throw();
const Time getLastMouseDownTime() const throw();
int getNumberOfMultipleClicks() const throw();
Component* kioskModeComponent;
Rectangle kioskComponentOriginalBounds;
Rectangle<int> kioskComponentOriginalBounds;
void timerCallback();
void sendMouseMove();
void resetTimer() throw();
int getNumDisplayMonitors() const throw();
const Rectangle getDisplayMonitorCoordinates (const int index, const bool clippedToWorkArea) const throw();
const Rectangle<int> getDisplayMonitorCoordinates (const int index, const bool clippedToWorkArea) const throw();
void addDesktopComponent (Component* const c) throw();
void removeDesktopComponent (Component* const c) throw();

16
src/gui/components/layout/juce_ComponentAnimator.cpp
View file

@ -41,7 +41,7 @@ struct AnimationTask
Component* component;
ComponentDeletionWatcher watcher;
Rectangle destination;
Rectangle<int> destination;
int msElapsed, msTotal;
double startSpeed, midSpeed, endSpeed, lastProgress;
double left, top, right, bottom;
@ -68,10 +68,10 @@ struct AnimationTask
if (delta < 1.0)
{
const Rectangle newBounds (roundToInt (left),
roundToInt (top),
roundToInt (right - left),
roundToInt (bottom - top));
const Rectangle<int> newBounds (roundToInt (left),
roundToInt (top),
roundToInt (right - left),
roundToInt (bottom - top));
if (newBounds != destination)
{
@ -123,7 +123,7 @@ void* ComponentAnimator::findTaskFor (Component* const component) const
}
void ComponentAnimator::animateComponent (Component* const component,
const Rectangle& finalPosition,
const Rectangle<int>& finalPosition,
const int millisecondsToSpendMoving,
const double startSpeed,
const double endSpeed)
@ -196,7 +196,7 @@ void ComponentAnimator::cancelAnimation (Component* const component,
}
}
const Rectangle ComponentAnimator::getComponentDestination (Component* const component)
const Rectangle<int> ComponentAnimator::getComponentDestination (Component* const component)
{
AnimationTask* const at = (AnimationTask*) findTaskFor (component);
@ -205,7 +205,7 @@ const Rectangle ComponentAnimator::getComponentDestination (Component* const com
else if (component != 0)
return component->getBounds();
return Rectangle();
return Rectangle<int>();
}
bool ComponentAnimator::isAnimating (Component* component) const

4
src/gui/components/layout/juce_ComponentAnimator.h
View file

@ -88,7 +88,7 @@ public:
animation, set both the start and end speeds to 1.0
*/
void animateComponent (Component* const component,
const Rectangle& finalPosition,
const Rectangle<int>& finalPosition,
const int millisecondsToSpendMoving,
const double startSpeed = 1.0,
const double endSpeed = 1.0);
@ -118,7 +118,7 @@ public:
If the specified component isn't currently being animated, this method will just
return its current position.
*/
const Rectangle getComponentDestination (Component* const component);
const Rectangle<int> getComponentDestination (Component* const component);
/** Returns true if the specified component is currently being animated.
*/

6
src/gui/components/layout/juce_ComponentBoundsConstrainer.cpp
View file

@ -142,7 +142,7 @@ void ComponentBoundsConstrainer::setBoundsForComponent (Component* const compone
{
jassert (component != 0);
Rectangle limits;
Rectangle<int> limits;
Component* const p = component->getParentComponent();
if (p == 0)
@ -206,8 +206,8 @@ void ComponentBoundsConstrainer::resizeEnd()
//==============================================================================
void ComponentBoundsConstrainer::checkBounds (int& x, int& y, int& w, int& h,
const Rectangle& old,
const Rectangle& limits,
const Rectangle<int>& old,
const Rectangle<int>& limits,
const bool isStretchingTop,
const bool isStretchingLeft,
const bool isStretchingBottom,

4
src/gui/components/layout/juce_ComponentBoundsConstrainer.h
View file

@ -145,8 +145,8 @@ public:
@param isStretchingRight whether the right edge of the component is being resized
*/
virtual void checkBounds (int& x, int& y, int& w, int& h,
const Rectangle& previousBounds,
const Rectangle& limits,
const Rectangle<int>& previousBounds,
const Rectangle<int>& limits,
const bool isStretchingTop,
const bool isStretchingLeft,
const bool isStretchingBottom,

2
src/gui/components/layout/juce_TabbedComponent.cpp
View file

@ -302,7 +302,7 @@ void TabbedComponent::resized()
indents.setRight (tabDepth + edgeIndent);
}
const Rectangle bounds (indents.subtractedFrom (Rectangle (0, 0, getWidth(), getHeight())));
const Rectangle<int> bounds (indents.subtractedFrom (Rectangle<int> (0, 0, getWidth(), getHeight())));
for (int i = contentComponents.size(); --i >= 0;)
if (contentComponents.getUnchecked (i) != 0)

16
src/gui/components/lookandfeel/juce_LookAndFeel.cpp
View file

@ -531,7 +531,7 @@ AlertWindow* LookAndFeel::createAlertWindow (const String& title,
void LookAndFeel::drawAlertBox (Graphics& g,
AlertWindow& alert,
const Rectangle& textArea,
const Rectangle<int>& textArea,
TextLayout& textLayout)
{
g.fillAll (alert.findColour (AlertWindow::backgroundColourId));
@ -545,8 +545,8 @@ void LookAndFeel::drawAlertBox (Graphics& g,
if (alert.containsAnyExtraComponents() || alert.getNumButtons() > 2)
iconSize = jmin (iconSize, textArea.getHeight() + 50);
const Rectangle iconRect (iconSize / -10, iconSize / -10,
iconSize, iconSize);
const Rectangle<int> iconRect (iconSize / -10, iconSize / -10,
iconSize, iconSize);
if (alert.getAlertType() != AlertWindow::NoIcon)
{
@ -2296,7 +2296,7 @@ void LookAndFeel::drawTabAreaBehindFrontButton (Graphics& g,
const float shadowSize = 0.2f;
float x1 = 0.0f, y1 = 0.0f, x2 = 0.0f, y2 = 0.0f;
Rectangle shadowRect;
Rectangle<int> shadowRect;
if (orientation == TabbedButtonBar::TabsAtLeft)
{
@ -2517,17 +2517,17 @@ void LookAndFeel::drawPropertyComponentLabel (Graphics& g, int, int height,
g.setFont (jmin (height, 24) * 0.65f);
const Rectangle r (getPropertyComponentContentPosition (component));
const Rectangle<int> r (getPropertyComponentContentPosition (component));
g.drawFittedText (component.getName(),
3, r.getY(), r.getX() - 5, r.getHeight(),
Justification::centredLeft, 2);
}
const Rectangle LookAndFeel::getPropertyComponentContentPosition (PropertyComponent& component)
const Rectangle<int> LookAndFeel::getPropertyComponentContentPosition (PropertyComponent& component)
{
return Rectangle (component.getWidth() / 3, 1,
component.getWidth() - component.getWidth() / 3 - 1, component.getHeight() - 3);
return Rectangle<int> (component.getWidth() / 3, 1,
component.getWidth() - component.getWidth() / 3 - 1, component.getHeight() - 3);
}
//==============================================================================

4
src/gui/components/lookandfeel/juce_LookAndFeel.h
View file

@ -191,7 +191,7 @@ public:
virtual void drawAlertBox (Graphics& g,
AlertWindow& alert,
const Rectangle& textArea,
const Rectangle<int>& textArea,
TextLayout& textLayout);
virtual int getAlertBoxWindowFlags();
@ -595,7 +595,7 @@ public:
virtual void drawPropertyComponentLabel (Graphics& g, int width, int height,
PropertyComponent& component);
virtual const Rectangle getPropertyComponentContentPosition (PropertyComponent& component);
virtual const Rectangle<int> getPropertyComponentContentPosition (PropertyComponent& component);
//==============================================================================
virtual void drawLevelMeter (Graphics& g, int width, int height, float level);

2
src/gui/components/lookandfeel/juce_OldSchoolLookAndFeel.cpp
View file

@ -268,7 +268,7 @@ void OldSchoolLookAndFeel::drawScrollbar (Graphics& g,
if (thumbSize > 0.0f)
{
Rectangle thumb;
Rectangle<int> thumb;
if (isScrollbarVertical)
{

24
src/gui/components/menus/juce_PopupMenu.cpp
View file

@ -758,7 +758,7 @@ private:
ApplicationCommandManager** managerOfChosenCommand;
Component* componentAttachedTo;
ScopedPointer <ComponentDeletionWatcher> attachedCompWatcher;
Rectangle windowPos;
Rectangle<int> windowPos;
int lastMouseX, lastMouseY;
int minimumWidth, maximumNumColumns, standardItemHeight;
bool isOver, hasBeenOver, isDown, needsToScroll;
@ -769,7 +769,7 @@ private:
double scrollAcceleration;
//==============================================================================
bool overlaps (const Rectangle& r) const
bool overlaps (const Rectangle<int>& r) const
{
return r.intersects (getBounds())
|| (owner != 0 && owner->overlaps (r));
@ -822,13 +822,13 @@ private:
const int minY, const int maxY,
const bool alignToRectangle)
{
const Rectangle mon (Desktop::getInstance()
.getMonitorAreaContaining ((minX + maxX) / 2,
(minY + maxY) / 2,
const Rectangle<int> mon (Desktop::getInstance()
.getMonitorAreaContaining ((minX + maxX) / 2,
(minY + maxY) / 2,
#if JUCE_MAC
true));
true));
#else
false)); // on windows, don't stop the menu overlapping the taskbar
false)); // on windows, don't stop the menu overlapping the taskbar
#endif
int x, y, widthToUse, heightToUse;
@ -995,10 +995,10 @@ private:
windowPos.getHeight() - (PopupMenuSettings::scrollZone + m->getHeight())),
currentY);
const Rectangle mon (Desktop::getInstance()
.getMonitorAreaContaining (windowPos.getX(),
windowPos.getY(),
true));
const Rectangle<int> mon (Desktop::getInstance()
.getMonitorAreaContaining (windowPos.getX(),
windowPos.getY(),
true));
int deltaY = wantedY - currentY;
@ -1021,7 +1021,7 @@ private:
void resizeToBestWindowPos()
{
Rectangle r (windowPos);
Rectangle<int> r (windowPos);
if (childYOffset < 0)
{

8
src/gui/components/mouse/juce_DragAndDropContainer.cpp
View file

@ -345,7 +345,7 @@ void DragAndDropContainer::startDragging (const String& sourceDescription,
Component* sourceComponent,
Image* dragImage_,
const bool allowDraggingToExternalWindows,
const Point* imageOffsetFromMouse)
const Point<int>* imageOffsetFromMouse)
{
ScopedPointer <Image> dragImage (dragImage_);
@ -361,7 +361,7 @@ void DragAndDropContainer::startDragging (const String& sourceDescription,
if (dragImage == 0)
{
dragImage = sourceComponent->createComponentSnapshot (Rectangle (0, 0, sourceComponent->getWidth(), sourceComponent->getHeight()));
dragImage = sourceComponent->createComponentSnapshot (Rectangle<int> (0, 0, sourceComponent->getWidth(), sourceComponent->getHeight()));
if (dragImage->getFormat() != Image::ARGB)
{
@ -414,8 +414,8 @@ void DragAndDropContainer::startDragging (const String& sourceDescription,
}
else
{
imageX = (int) imageOffsetFromMouse->getX();
imageY = (int) imageOffsetFromMouse->getY();
imageX = imageOffsetFromMouse->getX();
imageY = imageOffsetFromMouse->getY();
}
}

2
src/gui/components/mouse/juce_DragAndDropContainer.h
View file

@ -94,7 +94,7 @@ public:
Component* sourceComponent,
Image* dragImage = 0,
const bool allowDraggingToOtherJuceWindows = false,
const Point* imageOffsetFromMouse = 0);
const Point<int>* imageOffsetFromMouse = 0);
/** Returns true if something is currently being dragged. */
bool isDragAndDropActive() const;

2
src/gui/components/properties/juce_BooleanPropertyComponent.cpp
View file

@ -81,7 +81,7 @@ void BooleanPropertyComponent::paint (Graphics& g)
{
PropertyComponent::paint (g);
const Rectangle r (button->getBounds());
const Rectangle<int> r (button->getBounds());
g.setColour (Colours::white);
g.fillRect (r);

2
src/gui/components/special/juce_ActiveXControlComponent.h
View file

@ -123,7 +123,7 @@ private:
ActiveXControlComponent (const ActiveXControlComponent&);
const ActiveXControlComponent& operator= (const ActiveXControlComponent&);
void setControlBounds (const Rectangle& bounds) const;
void setControlBounds (const Rectangle<int>& bounds) const;
void setControlVisible (const bool b) const;
};

8
src/gui/components/special/juce_BubbleComponent.cpp
View file

@ -106,19 +106,19 @@ void BubbleComponent::setPosition (Component* componentToPointTo)
else
componentToPointTo->relativePositionToGlobal (tx, ty);
setPosition (Rectangle (tx, ty, componentToPointTo->getWidth(), componentToPointTo->getHeight()));
setPosition (Rectangle<int> (tx, ty, componentToPointTo->getWidth(), componentToPointTo->getHeight()));
}
void BubbleComponent::setPosition (const int arrowTipX_,
const int arrowTipY_)
{
setPosition (Rectangle (arrowTipX_, arrowTipY_, 1, 1));
setPosition (Rectangle<int> (arrowTipX_, arrowTipY_, 1, 1));
}
//==============================================================================
void BubbleComponent::setPosition (const Rectangle& rectangleToPointTo)
void BubbleComponent::setPosition (const Rectangle<int>& rectangleToPointTo)
{
Rectangle availableSpace;
Rectangle<int> availableSpace;
if (getParentComponent() != 0)
{

4
src/gui/components/special/juce_BubbleComponent.h
View file

@ -125,7 +125,7 @@ public:
on where there's the most space, honouring any restrictions that were set
with setAllowedPlacement().
*/
void setPosition (const Rectangle& rectangleToPointTo);
void setPosition (const Rectangle<int>& rectangleToPointTo);
protected:
@ -151,7 +151,7 @@ public:
juce_UseDebuggingNewOperator
private:
Rectangle content;
Rectangle<int> content;
int side, allowablePlacements;
float arrowTipX, arrowTipY;
DropShadowEffect shadow;

2
src/gui/components/special/juce_ColourSelector.cpp
View file

@ -254,7 +254,7 @@ public:
{
const float yScale = 1.0f / (getHeight() - edge * 2);
const Rectangle clip (g.getClipBounds());
const Rectangle<int> clip (g.getClipBounds());
for (int y = jmin (clip.getBottom(), getHeight() - edge); --y >= jmax (edge, clip.getY());)
{

2
src/gui/components/special/juce_MagnifierComponent.cpp
View file

@ -252,7 +252,7 @@ void MagnifierComponent::paint (Graphics& g)
if (w == 0 || h == 0)
return;
const Rectangle r (g.getClipBounds());
const Rectangle<int> r (g.getClipBounds());
const int srcX = (int) (r.getX() / scaleFactor);
const int srcY = (int) (r.getY() / scaleFactor);

2
src/gui/components/special/juce_QuickTimeMovieComponent.h
View file

@ -142,7 +142,7 @@ public:
be aligned according to the justification value if this means there are gaps at
the top or sides.
*/
void setBoundsWithCorrectAspectRatio (const Rectangle& spaceToFitWithin,
void setBoundsWithCorrectAspectRatio (const Rectangle<int>& spaceToFitWithin,
const RectanglePlacement& placement);
/** Starts the movie playing. */

2
src/gui/components/windows/juce_AlertWindow.h
View file

@ -358,7 +358,7 @@ private:
AlertIconType alertIconType;
ComponentBoundsConstrainer constrainer;
ComponentDragger dragger;
Rectangle textArea;
Rectangle<int> textArea;
VoidArray buttons, textBoxes, comboBoxes;
VoidArray progressBars, customComps, textBlocks, allComps;
StringArray textboxNames, comboBoxNames;

4
src/gui/components/windows/juce_ComponentPeer.cpp
View file

@ -582,12 +582,12 @@ void ComponentPeer::handleScreenSizeChange()
handleMovedOrResized();
}
void ComponentPeer::setNonFullScreenBounds (const Rectangle& newBounds) throw()
void ComponentPeer::setNonFullScreenBounds (const Rectangle<int>& newBounds) throw()
{
lastNonFullscreenBounds = newBounds;
}
const Rectangle& ComponentPeer::getNonFullScreenBounds() const throw()
const Rectangle<int>& ComponentPeer::getNonFullScreenBounds() const throw()
{
return lastNonFullscreenBounds;
}

6
src/gui/components/windows/juce_ComponentPeer.h
View file

@ -174,10 +174,10 @@ public:
virtual bool isFullScreen() const = 0;
/** Sets the size to restore to if fullscreen mode is turned off. */
void setNonFullScreenBounds (const Rectangle& newBounds) throw();
void setNonFullScreenBounds (const Rectangle<int>& newBounds) throw();
/** Returns the size to restore to if fullscreen mode is turned off. */
const Rectangle& getNonFullScreenBounds() const throw();
const Rectangle<int>& getNonFullScreenBounds() const throw();
/** Attempts to change the icon associated with this window.
*/
@ -365,7 +365,7 @@ protected:
Component* const component;
const int styleFlags;
RectangleList maskedRegion;
Rectangle lastNonFullscreenBounds;
Rectangle<int> lastNonFullscreenBounds;
uint32 lastPaintTime;
ComponentBoundsConstrainer* constrainer;

14
src/gui/components/windows/juce_DocumentWindow.cpp
View file

@ -94,7 +94,7 @@ DocumentWindow::~DocumentWindow()
//==============================================================================
void DocumentWindow::repaintTitleBar()
{
const Rectangle titleBarArea (getTitleBarArea());
const Rectangle<int> titleBarArea (getTitleBarArea());
repaint (titleBarArea.getX(), titleBarArea.getY(),
titleBarArea.getWidth(), titleBarArea.getHeight());
}
@ -205,7 +205,7 @@ void DocumentWindow::paint (Graphics& g)
g.fillRect (0, getHeight() - border.getBottom(), getWidth(), border.getBottom());
}
const Rectangle titleBarArea (getTitleBarArea());
const Rectangle<int> titleBarArea (getTitleBarArea());
g.setOrigin (titleBarArea.getX(), titleBarArea.getY());
g.reduceClipRegion (0, 0, titleBarArea.getWidth(), titleBarArea.getHeight());
@ -239,7 +239,7 @@ void DocumentWindow::resized()
if (titleBarButtons[1] != 0)
titleBarButtons[1]->setToggleState (isFullScreen(), false);
const Rectangle titleBarArea (getTitleBarArea());
const Rectangle<int> titleBarArea (getTitleBarArea());
getLookAndFeel()
.positionDocumentWindowButtons (*this,
@ -277,13 +277,13 @@ int DocumentWindow::getTitleBarHeight() const
return isUsingNativeTitleBar() ? 0 : jmin (titleBarHeight, getHeight() - 4);
}
const Rectangle DocumentWindow::getTitleBarArea()
const Rectangle<int> DocumentWindow::getTitleBarArea()
{
const BorderSize border (getBorderThickness());
return Rectangle (border.getLeft(), border.getTop(),
getWidth() - border.getLeftAndRight(),
getTitleBarHeight());
return Rectangle<int> (border.getLeft(), border.getTop(),
getWidth() - border.getLeftAndRight(),
getTitleBarHeight());
}
Button* DocumentWindow::getCloseButton() const throw()

2
src/gui/components/windows/juce_DocumentWindow.h
View file

@ -240,7 +240,7 @@ public:
/** @internal */
void parentHierarchyChanged();
/** @internal */
const Rectangle getTitleBarArea();
const Rectangle<int> getTitleBarArea();
//==============================================================================
juce_UseDebuggingNewOperator

Some files were not shown because too many files have changed in this diff Show more