DISTRHO
/
JUCE
mirror of https://github.com/DISTRHO/JUCE
1
0
Fork 0
Code Releases 1 Activity
Browse Source

Moved the Grid unit tests into juce_Grid.cpp and re-saved all projects

tags/2021-05-28
ed 6 years ago
parent
ce20ab8a3b
commit
97e545cd44
35 changed files with 236 additions and 356 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -2
      examples/DemoRunner/Builds/Android/app/CMakeLists.txt
  2. +0
    -3
      examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj
  3. +0
    -3
      examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj.filters
  4. +0
    -3
      examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj
  5. +0
    -3
      examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters
  6. +0
    -3
      examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj
  7. +0
    -3
      examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters
  8. +0
    -2
      extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
  9. +0
    -3
      extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj
  10. +0
    -3
      extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj.filters
  11. +0
    -2
      extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
  12. +0
    -3
      extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj
  13. +0
    -3
      extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj.filters
  14. +0
    -3
      extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj
  15. +0
    -3
      extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters
  16. +0
    -3
      extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj
  17. +0
    -3
      extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters
  18. +0
    -2
      extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
  19. +0
    -3
      extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj
  20. +0
    -3
      extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj.filters
  21. +0
    -3
      extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj
  22. +0
    -3
      extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj.filters
  23. +0
    -3
      extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj
  24. +0
    -3
      extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters
  25. +0
    -3
      extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj
  26. +0
    -3
      extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters
  27. +0
    -3
      extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj
  28. +0
    -3
      extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters
  29. +0
    -3
      extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj
  30. +0
    -3
      extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters
  31. +0
    -3
      extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj
  32. +0
    -3
      extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj.filters
  33. +0
    -3
      modules/juce_gui_basics/juce_gui_basics.cpp
  34. +236
    -0
      modules/juce_gui_basics/layout/juce_Grid.cpp
  35. +0
    -261
      modules/juce_gui_basics/layout/juce_GridUnitTests.cpp

+ 0
- 2
examples/DemoRunner/Builds/Android/app/CMakeLists.txt View File

@@ -1297,7 +1297,6 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_gui_basics/layout/juce_Grid.h"
"../../../../../modules/juce_gui_basics/layout/juce_GridItem.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GridItem.h"
"../../../../../modules/juce_gui_basics/layout/juce_GridUnitTests.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.h"
"../../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp"
@@ -2895,7 +2894,6 @@ set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_Grid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridItem.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridItem.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridUnitTests.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)


+ 0
- 3
examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj View File

@@ -1797,9 +1797,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj.filters View File

@@ -2275,9 +2275,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj View File

@@ -1797,9 +1797,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters View File

@@ -2275,9 +2275,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj View File

@@ -1799,9 +1799,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters View File

@@ -2275,9 +2275,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 2
extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt View File

@@ -1067,7 +1067,6 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_gui_basics/layout/juce_Grid.h"
"../../../../../modules/juce_gui_basics/layout/juce_GridItem.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GridItem.h"
"../../../../../modules/juce_gui_basics/layout/juce_GridUnitTests.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.h"
"../../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp"
@@ -2352,7 +2351,6 @@ set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_Grid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridItem.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridItem.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridUnitTests.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)


+ 0
- 3
extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj View File

@@ -1507,9 +1507,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj.filters View File

@@ -1828,9 +1828,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 2
extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt View File

@@ -1099,7 +1099,6 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_gui_basics/layout/juce_Grid.h"
"../../../../../modules/juce_gui_basics/layout/juce_GridItem.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GridItem.h"
"../../../../../modules/juce_gui_basics/layout/juce_GridUnitTests.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.h"
"../../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp"
@@ -2457,7 +2456,6 @@ set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_Grid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridItem.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridItem.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridUnitTests.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)


+ 0
- 3
extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj View File

@@ -1535,9 +1535,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj.filters View File

@@ -1909,9 +1909,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj View File

@@ -1533,9 +1533,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters View File

@@ -1909,9 +1909,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj View File

@@ -1535,9 +1535,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters View File

@@ -1909,9 +1909,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 2
extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt View File

@@ -1086,7 +1086,6 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_gui_basics/layout/juce_Grid.h"
"../../../../../modules/juce_gui_basics/layout/juce_GridItem.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GridItem.h"
"../../../../../modules/juce_gui_basics/layout/juce_GridUnitTests.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.cpp"
"../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.h"
"../../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp"
@@ -2446,7 +2445,6 @@ set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_Grid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridItem.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridItem.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GridUnitTests.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_GroupComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)


+ 0
- 3
extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj View File

@@ -1528,9 +1528,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj.filters View File

@@ -1882,9 +1882,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj View File

@@ -1528,9 +1528,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj.filters View File

@@ -1882,9 +1882,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj View File

@@ -1114,9 +1114,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters View File

@@ -1435,9 +1435,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj View File

@@ -1114,9 +1114,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters View File

@@ -1435,9 +1435,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj View File

@@ -1116,9 +1116,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters View File

@@ -1435,9 +1435,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj View File

@@ -1655,9 +1655,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters View File

@@ -2083,9 +2083,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj View File

@@ -1527,9 +1527,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>


+ 0
- 3
extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj.filters View File

@@ -1879,9 +1879,6 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridItem.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
<Filter>JUCE Modules\juce_gui_basics\layout</Filter>
</ClCompile>


+ 0
- 3
modules/juce_gui_basics/juce_gui_basics.cpp View File

@@ -270,9 +270,6 @@ namespace juce
#if JUCE_HAS_CONSTEXPR
#include "layout/juce_GridItem.cpp"
#include "layout/juce_Grid.cpp"
#if JUCE_UNIT_TESTS
#include "layout/juce_GridUnitTests.cpp"
#endif
#endif
#if JUCE_IOS || JUCE_WINDOWS


+ 236
- 0
modules/juce_gui_basics/layout/juce_Grid.cpp View File

@@ -1026,4 +1026,240 @@ void Grid::performLayout (juce::Rectangle<int> targetArea)
}
}
//==============================================================================
#if JUCE_UNIT_TESTS
struct GridTests : public UnitTest
{
GridTests() : UnitTest ("Grid", "GUI") {}
void runTest() override
{
using Fr = Grid::Fr;
using Tr = Grid::TrackInfo;
using Rect = Rectangle<float>;
{
Grid grid;
grid.templateColumns.add (Tr (1_fr));
grid.templateRows.addArray ({ Tr (20_px), Tr (1_fr) });
grid.items.addArray ({ GridItem().withArea (1, 1),
GridItem().withArea (2, 1) });
grid.performLayout (Rectangle<int> (200, 400));
beginTest ("Layout calculation test: 1 column x 2 rows: no gap");
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 200.f, 20.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 20.0f, 200.f, 380.0f));
grid.templateColumns.add (Tr (50_px));
grid.templateRows.add (Tr (2_fr));
grid.items.addArray ( { GridItem().withArea (1, 2),
GridItem().withArea (2, 2),
GridItem().withArea (3, 1),
GridItem().withArea (3, 2) });
grid.performLayout (Rectangle<int> (150, 170));
beginTest ("Layout calculation test: 2 columns x 3 rows: no gap");
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 100.0f, 20.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 20.0f, 100.0f, 50.0f));
expect (grid.items[2].currentBounds == Rect (100.0f, 0.0f, 50.0f, 20.0f));
expect (grid.items[3].currentBounds == Rect (100.0f, 20.0f, 50.0f, 50.0f));
expect (grid.items[4].currentBounds == Rect (0.0f, 70.0f, 100.0f, 100.0f));
expect (grid.items[5].currentBounds == Rect (100.0f, 70.0f, 50.0f, 100.0f));
grid.columnGap = 20_px;
grid.rowGap = 10_px;
grid.performLayout (Rectangle<int> (200, 310));
beginTest ("Layout calculation test: 2 columns x 3 rows: rowGap of 10 and columnGap of 20");
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 130.0f, 20.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 30.0f, 130.0f, 90.0f));
expect (grid.items[2].currentBounds == Rect (150.0f, 0.0f, 50.0f, 20.0f));
expect (grid.items[3].currentBounds == Rect (150.0f, 30.0f, 50.0f, 90.0f));
expect (grid.items[4].currentBounds == Rect (0.0f, 130.0f, 130.0f, 180.0f));
expect (grid.items[5].currentBounds == Rect (150.0f, 130.0f, 50.0f, 180.0f));
}
{
Grid grid;
grid.templateColumns.addArray ({ Tr ("first", 20_px, "in"), Tr ("in", 1_fr, "in"), Tr (20_px, "last") });
grid.templateRows.addArray ({ Tr (1_fr),
Tr (20_px)});
{
beginTest ("Grid items placement tests: integer and custom ident, counting forward");
GridItem i1, i2, i3, i4, i5;
i1.column = { 1, 4 };
i1.row = { 1, 2 };
i2.column = { 1, 3 };
i2.row = { 1, 3 };
i3.column = { "first", "in" };
i3.row = { 2, 3 };
i4.column = { "first", { 2, "in" } };
i4.row = { 1, 2 };
i5.column = { "first", "last" };
i5.row = { 1, 2 };
grid.items.addArray ({ i1, i2, i3, i4, i5 });
grid.performLayout ({ 140, 100 });
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 140.0f, 80.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 0.0f, 120.0f, 100.0f));
expect (grid.items[2].currentBounds == Rect (0.0f, 80.0f, 20.0f, 20.0f));
expect (grid.items[3].currentBounds == Rect (0.0f, 0.0f, 120.0f, 80.0f));
expect (grid.items[4].currentBounds == Rect (0.0f, 0.0f, 140.0f, 80.0f));
}
}
{
Grid grid;
grid.templateColumns.addArray ({ Tr ("first", 20_px, "in"), Tr ("in", 1_fr, "in"), Tr (20_px, "last") });
grid.templateRows.addArray ({ Tr (1_fr),
Tr (20_px)});
beginTest ("Grid items placement tests: integer and custom ident, counting forward, reversed end and start");
GridItem i1, i2, i3, i4, i5;
i1.column = { 4, 1 };
i1.row = { 2, 1 };
i2.column = { 3, 1 };
i2.row = { 3, 1 };
i3.column = { "in", "first" };
i3.row = { 3, 2 };
i4.column = { "first", { 2, "in" } };
i4.row = { 1, 2 };
i5.column = { "last", "first" };
i5.row = { 1, 2 };
grid.items.addArray ({ i1, i2, i3, i4, i5 });
grid.performLayout ({ 140, 100 });
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 140.0f, 80.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 0.0f, 120.0f, 100.0f));
expect (grid.items[2].currentBounds == Rect (0.0f, 80.0f, 20.0f, 20.0f));
expect (grid.items[3].currentBounds == Rect (0.0f, 0.0f, 120.0f, 80.0f));
expect (grid.items[4].currentBounds == Rect (0.0f, 0.0f, 140.0f, 80.0f));
}
{
beginTest ("Grid items placement tests: areas");
Grid grid;
grid.templateColumns = { Tr (50_px), Tr (100_px), Tr (Fr (1_fr)), Tr (50_px) };
grid.templateRows = { Tr (50_px),
Tr (1_fr),
Tr (50_px) };
grid.templateAreas = { "header header header header",
"main main . sidebar",
"footer footer footer footer" };
grid.items.addArray ({ GridItem().withArea ("header"),
GridItem().withArea ("main"),
GridItem().withArea ("sidebar"),
GridItem().withArea ("footer"),
});
grid.performLayout ({ 300, 150 });
expect (grid.items[0].currentBounds == Rect (0.f, 0.f, 300.f, 50.f));
expect (grid.items[1].currentBounds == Rect (0.f, 50.f, 150.f, 50.f));
expect (grid.items[2].currentBounds == Rect (250.f, 50.f, 50.f, 50.f));
expect (grid.items[3].currentBounds == Rect (0.f, 100.f, 300.f, 50.f));
}
{
beginTest ("Grid implicit rows and columns: triggered by areas");
Grid grid;
grid.templateColumns = { Tr (50_px), Tr (100_px), Tr (1_fr), Tr (50_px) };
grid.templateRows = { Tr (50_px),
Tr (1_fr),
Tr (50_px) };
grid.autoRows = Tr (30_px);
grid.autoColumns = Tr (30_px);
grid.templateAreas = { "header header header header header",
"main main . sidebar sidebar",
"footer footer footer footer footer",
"sub sub sub sub sub"};
grid.items.addArray ({ GridItem().withArea ("header"),
GridItem().withArea ("main"),
GridItem().withArea ("sidebar"),
GridItem().withArea ("footer"),
GridItem().withArea ("sub"),
});
grid.performLayout ({ 330, 180 });
expect (grid.items[0].currentBounds == Rect (0.f, 0.f, 330.f, 50.f));
expect (grid.items[1].currentBounds == Rect (0.f, 50.f, 150.f, 50.f));
expect (grid.items[2].currentBounds == Rect (250.f, 50.f, 80.f, 50.f));
expect (grid.items[3].currentBounds == Rect (0.f, 100.f, 330.f, 50.f));
expect (grid.items[4].currentBounds == Rect (0.f, 150.f, 330.f, 30.f));
}
{
beginTest ("Grid implicit rows and columns: triggered by areas");
Grid grid;
grid.templateColumns = { Tr (50_px), Tr (100_px), Tr (1_fr), Tr (50_px) };
grid.templateRows = { Tr (50_px),
Tr (1_fr),
Tr (50_px) };
grid.autoRows = Tr (1_fr);
grid.autoColumns = Tr (1_fr);
grid.templateAreas = { "header header header header",
"main main . sidebar",
"footer footer footer footer" };
grid.items.addArray ({ GridItem().withArea ("header"),
GridItem().withArea ("main"),
GridItem().withArea ("sidebar"),
GridItem().withArea ("footer"),
GridItem().withArea (4, 5, 6, 7)
});
grid.performLayout ({ 350, 250 });
expect (grid.items[0].currentBounds == Rect (0.f, 0.f, 250.f, 50.f));
expect (grid.items[1].currentBounds == Rect (0.f, 50.f, 150.f, 50.f));
expect (grid.items[2].currentBounds == Rect (200.f, 50.f, 50.f, 50.f));
expect (grid.items[3].currentBounds == Rect (0.f, 100.f, 250.f, 50.f));
expect (grid.items[4].currentBounds == Rect (250.f, 150.f, 100.f, 100.f));
}
}
};
static GridTests gridUnitTests;
#endif // JUCE_UNIT_TESTS
} // namespace juce

+ 0
- 261
modules/juce_gui_basics/layout/juce_GridUnitTests.cpp View File

@@ -1,261 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2017 - ROLI Ltd.
JUCE is an open source library subject to commercial or open-source
licensing.
By using JUCE, you agree to the terms of both the JUCE 5 End-User License
Agreement and JUCE 5 Privacy Policy (both updated and effective as of the
27th April 2017).
End User License Agreement: www.juce.com/juce-5-licence
Privacy Policy: www.juce.com/juce-5-privacy-policy
Or: You may also use this code under the terms of the GPL v3 (see
www.gnu.org/licenses).
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
==============================================================================
*/
namespace juce
{
struct GridTests : public UnitTest
{
GridTests() : UnitTest ("Grid class") {}
void runTest() override
{
using Fr = Grid::Fr;
using Tr = Grid::TrackInfo;
using Rect = Rectangle<float>;
{
Grid grid;
grid.templateColumns.add (Tr (1_fr));
grid.templateRows.addArray ({ Tr (20_px), Tr (1_fr) });
grid.items.addArray ({ GridItem().withArea (1, 1),
GridItem().withArea (2, 1) });
grid.performLayout (Rectangle<int> (200, 400));
beginTest ("Layout calculation test: 1 column x 2 rows: no gap");
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 200.f, 20.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 20.0f, 200.f, 380.0f));
grid.templateColumns.add (Tr (50_px));
grid.templateRows.add (Tr (2_fr));
grid.items.addArray ( { GridItem().withArea (1, 2),
GridItem().withArea (2, 2),
GridItem().withArea (3, 1),
GridItem().withArea (3, 2) });
grid.performLayout (Rectangle<int> (150, 170));
beginTest ("Layout calculation test: 2 columns x 3 rows: no gap");
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 100.0f, 20.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 20.0f, 100.0f, 50.0f));
expect (grid.items[2].currentBounds == Rect (100.0f, 0.0f, 50.0f, 20.0f));
expect (grid.items[3].currentBounds == Rect (100.0f, 20.0f, 50.0f, 50.0f));
expect (grid.items[4].currentBounds == Rect (0.0f, 70.0f, 100.0f, 100.0f));
expect (grid.items[5].currentBounds == Rect (100.0f, 70.0f, 50.0f, 100.0f));
grid.columnGap = 20_px;
grid.rowGap = 10_px;
grid.performLayout (Rectangle<int> (200, 310));
beginTest ("Layout calculation test: 2 columns x 3 rows: rowGap of 10 and columnGap of 20");
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 130.0f, 20.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 30.0f, 130.0f, 90.0f));
expect (grid.items[2].currentBounds == Rect (150.0f, 0.0f, 50.0f, 20.0f));
expect (grid.items[3].currentBounds == Rect (150.0f, 30.0f, 50.0f, 90.0f));
expect (grid.items[4].currentBounds == Rect (0.0f, 130.0f, 130.0f, 180.0f));
expect (grid.items[5].currentBounds == Rect (150.0f, 130.0f, 50.0f, 180.0f));
}
{
Grid grid;
grid.templateColumns.addArray ({ Tr ("first", 20_px, "in"), Tr ("in", 1_fr, "in"), Tr (20_px, "last") });
grid.templateRows.addArray ({ Tr (1_fr),
Tr (20_px)});
{
beginTest ("Grid items placement tests: integer and custom ident, counting forward");
GridItem i1, i2, i3, i4, i5;
i1.column = { 1, 4 };
i1.row = { 1, 2 };
i2.column = { 1, 3 };
i2.row = { 1, 3 };
i3.column = { "first", "in" };
i3.row = { 2, 3 };
i4.column = { "first", { 2, "in" } };
i4.row = { 1, 2 };
i5.column = { "first", "last" };
i5.row = { 1, 2 };
grid.items.addArray ({ i1, i2, i3, i4, i5 });
grid.performLayout ({ 140, 100 });
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 140.0f, 80.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 0.0f, 120.0f, 100.0f));
expect (grid.items[2].currentBounds == Rect (0.0f, 80.0f, 20.0f, 20.0f));
expect (grid.items[3].currentBounds == Rect (0.0f, 0.0f, 120.0f, 80.0f));
expect (grid.items[4].currentBounds == Rect (0.0f, 0.0f, 140.0f, 80.0f));
}
}
{
Grid grid;
grid.templateColumns.addArray ({ Tr ("first", 20_px, "in"), Tr ("in", 1_fr, "in"), Tr (20_px, "last") });
grid.templateRows.addArray ({ Tr (1_fr),
Tr (20_px)});
beginTest ("Grid items placement tests: integer and custom ident, counting forward, reversed end and start");
GridItem i1, i2, i3, i4, i5;
i1.column = { 4, 1 };
i1.row = { 2, 1 };
i2.column = { 3, 1 };
i2.row = { 3, 1 };
i3.column = { "in", "first" };
i3.row = { 3, 2 };
i4.column = { "first", { 2, "in" } };
i4.row = { 1, 2 };
i5.column = { "last", "first" };
i5.row = { 1, 2 };
grid.items.addArray ({ i1, i2, i3, i4, i5 });
grid.performLayout ({ 140, 100 });
expect (grid.items[0].currentBounds == Rect (0.0f, 0.0f, 140.0f, 80.0f));
expect (grid.items[1].currentBounds == Rect (0.0f, 0.0f, 120.0f, 100.0f));
expect (grid.items[2].currentBounds == Rect (0.0f, 80.0f, 20.0f, 20.0f));
expect (grid.items[3].currentBounds == Rect (0.0f, 0.0f, 120.0f, 80.0f));
expect (grid.items[4].currentBounds == Rect (0.0f, 0.0f, 140.0f, 80.0f));
}
{
beginTest ("Grid items placement tests: areas");
Grid grid;
grid.templateColumns = { Tr (50_px), Tr (100_px), Tr (Fr (1_fr)), Tr (50_px) };
grid.templateRows = { Tr (50_px),
Tr (1_fr),
Tr (50_px) };
grid.templateAreas = { "header header header header",
"main main . sidebar",
"footer footer footer footer" };
grid.items.addArray ({ GridItem().withArea ("header"),
GridItem().withArea ("main"),
GridItem().withArea ("sidebar"),
GridItem().withArea ("footer"),
});
grid.performLayout ({ 300, 150 });
expect (grid.items[0].currentBounds == Rect (0.f, 0.f, 300.f, 50.f));
expect (grid.items[1].currentBounds == Rect (0.f, 50.f, 150.f, 50.f));
expect (grid.items[2].currentBounds == Rect (250.f, 50.f, 50.f, 50.f));
expect (grid.items[3].currentBounds == Rect (0.f, 100.f, 300.f, 50.f));
}
{
beginTest ("Grid implicit rows and columns: triggered by areas");
Grid grid;
grid.templateColumns = { Tr (50_px), Tr (100_px), Tr (1_fr), Tr (50_px) };
grid.templateRows = { Tr (50_px),
Tr (1_fr),
Tr (50_px) };
grid.autoRows = Tr (30_px);
grid.autoColumns = Tr (30_px);
grid.templateAreas = { "header header header header header",
"main main . sidebar sidebar",
"footer footer footer footer footer",
"sub sub sub sub sub"};
grid.items.addArray ({ GridItem().withArea ("header"),
GridItem().withArea ("main"),
GridItem().withArea ("sidebar"),
GridItem().withArea ("footer"),
GridItem().withArea ("sub"),
});
grid.performLayout ({ 330, 180 });
expect (grid.items[0].currentBounds == Rect (0.f, 0.f, 330.f, 50.f));
expect (grid.items[1].currentBounds == Rect (0.f, 50.f, 150.f, 50.f));
expect (grid.items[2].currentBounds == Rect (250.f, 50.f, 80.f, 50.f));
expect (grid.items[3].currentBounds == Rect (0.f, 100.f, 330.f, 50.f));
expect (grid.items[4].currentBounds == Rect (0.f, 150.f, 330.f, 30.f));
}
{
beginTest ("Grid implicit rows and columns: triggered by areas");
Grid grid;
grid.templateColumns = { Tr (50_px), Tr (100_px), Tr (1_fr), Tr (50_px) };
grid.templateRows = { Tr (50_px),
Tr (1_fr),
Tr (50_px) };
grid.autoRows = Tr (1_fr);
grid.autoColumns = Tr (1_fr);
grid.templateAreas = { "header header header header",
"main main . sidebar",
"footer footer footer footer" };
grid.items.addArray ({ GridItem().withArea ("header"),
GridItem().withArea ("main"),
GridItem().withArea ("sidebar"),
GridItem().withArea ("footer"),
GridItem().withArea (4, 5, 6, 7)
});
grid.performLayout ({ 350, 250 });
expect (grid.items[0].currentBounds == Rect (0.f, 0.f, 250.f, 50.f));
expect (grid.items[1].currentBounds == Rect (0.f, 50.f, 150.f, 50.f));
expect (grid.items[2].currentBounds == Rect (200.f, 50.f, 50.f, 50.f));
expect (grid.items[3].currentBounds == Rect (0.f, 100.f, 250.f, 50.f));
expect (grid.items[4].currentBounds == Rect (250.f, 150.f, 100.f, 100.f));
}
}
};
static GridTests gridUnitTests;
} // namespace juce

Write Preview
Loading…
Cancel
Save