squashed rebase from master

Author: djowel

.gitignore

@@ -31,3 +31,4 @@ xcuserdata/
 /cmake-build-release/
 /.vs/
 /CMakeSettings.json
+/lib/artist/

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "lib/external/asio"]
 	path = lib/external/asio
 	url = https://github.com/chriskohlhoff/asio.git
-[submodule "lib/artist"]
-	path = lib/artist
-	url = https://github.com/cycfi/artist.git

cmake/ElementsConfigApp.cmake

@@ -43,14 +43,6 @@ else()
    endif()
 endif()
 
-###############################################################################
-# Linux Open GL
-
-if (UNIX AND NOT APPLE)
-   find_package(PkgConfig REQUIRED)
-   find_package(OpenGL REQUIRED COMPONENTS OpenGL)
-endif()
-
 ###############################################################################
 # Sources (and Resources)
 
@@ -120,29 +112,25 @@ elseif (WIN32)
    )
 
    if (MSVC)
-
-      set_property(TARGET ${ELEMENTS_APP_PROJECT} PROPERTY
-         MSVC_RUNTIME_LIBRARY "MultiThreaded"
-      )
-
       target_link_options(${ELEMENTS_APP_PROJECT} PRIVATE
          /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup shcore.lib
       )
 
-      add_dependencies(${PROJECT_NAME} windows_dlls)
-
       if (CMAKE_SIZEOF_VOID_P EQUAL 8) # 64 bits?
+         set(CAIRO_DLL ${ELEMENTS_ROOT}/lib/external/cairo/lib/x64/cairo.dll)
          set(FREETYPE_DLL ${ELEMENTS_ROOT}/lib/external/freetype/win64/freetype.dll)
          set(FONTCONFIG_DLL ${ELEMENTS_ROOT}/lib/external/fontconfig/x64/fontconfig.dll)
          set(ICONV_DLL ${ELEMENTS_ROOT}/lib/external/fontconfig/x64/libiconv.dll)
          set(XML2 ${ELEMENTS_ROOT}/lib/external/fontconfig/x64/libxml2.dll)
       else()
+         set(CAIRO_DLL ${ELEMENTS_ROOT}/lib/external/cairo/lib/x86/cairo.dll)
          set(FREETYPE_DLL ${ELEMENTS_ROOT}/lib/external/freetype/win32/freetype.dll)
          set(FONTCONFIG_DLL ${ELEMENTS_ROOT}/lib/external/fontconfig/x86/fontconfig.dll)
          set(ICONV_DLL ${ELEMENTS_ROOT}/lib/external/fontconfig/x86/libiconv.dll)
          set(XML2 ${ELEMENTS_ROOT}/lib/external/fontconfig/x86/libxml2.dll)
       endif()
 
+      file(COPY ${CAIRO_DLL} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
       file(COPY ${FREETYPE_DLL} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
       file(COPY ${FONTCONFIG_DLL} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
       file(COPY ${ICONV_DLL} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
@@ -170,7 +158,6 @@ endif()
 target_link_libraries(${ELEMENTS_APP_PROJECT} PRIVATE
    ${ELEMENTS_APP_DEPENDENCIES}
    elements
-   ${OPENGL_LIBRARIES}
 )
 
 if (NOT DEFINED ELEMENTS_APP_INCLUDE_DIRECTORIES)

examples/CMakeLists.txt

@@ -12,15 +12,13 @@ add_subdirectory(dialogs)
 add_subdirectory(scale)
 add_subdirectory(notebook)
 add_subdirectory(doc_aspects)
-add_subdirectory(rain)
+add_subdirectory(simple_animation)
 add_subdirectory(thumbwheels)
 add_subdirectory(tooltip)
-add_subdirectory(list)
-add_subdirectory(active_list)
-add_subdirectory(list_arranger)
+add_subdirectory(dynamic_list)
+add_subdirectory(active_dynamic_list)
 add_subdirectory(custom_control)
 add_subdirectory(child_window)
 add_subdirectory(sync_scrollbars)
 add_subdirectory(icons_list)
-add_subdirectory(table_list)
 add_subdirectory(drop_file)

examples/active_list/main.cpp

@@ -6,7 +6,6 @@
 #include <elements.hpp>
 
 using namespace cycfi::elements;
-using cycfi::artist::rgba;
 
 // Main window background color
 auto constexpr bkd_color = rgba(35, 35, 37, 255);

examples/basic_sliders_and_knobs/main.cpp

@@ -6,7 +6,6 @@
 #include <elements.hpp>
 
 using namespace cycfi::elements;
-using cycfi::artist::rgba;
 
 // Main window background color
 auto constexpr bkd_color = rgba(35, 35, 37, 255);
@@ -84,8 +83,8 @@ auto make_dial(int index)
 
    auto markers = radial_labels<15>(
       hold(dials[index]),
-      0.7,                                // Label font size (relative size)
-      "0", "1", "2", "3", "4",            // Labels
+      0.7,                                   // Label font size (relative size)
+      "0", "1", "2", "3", "4",               // Labels
       "5", "6", "7", "8", "9", "10"
    );
 

examples/buttons/main.cpp

@@ -8,8 +8,6 @@
 #include <random>
 
 using namespace cycfi::elements;
-using cycfi::artist::rgba;
-namespace colors = cycfi::artist::colors;
 
 // Main window background color
 auto constexpr bkd_color = rgba(35, 35, 37, 255);
@@ -43,7 +41,7 @@ view_limits my_custom_button::limits(basic_context const& ctx) const
 
 void my_custom_button::draw(context const& ctx)
 {
-   auto& cnv = ctx.canvas;    // The artist canvas
+   auto& cnv = ctx.canvas;    // The canvas
    auto bounds = ctx.bounds;  // The bounding rectangle
 
    // This is the state of the button. Adjust the rendering based on these if
@@ -59,7 +57,7 @@ void my_custom_button::draw(context const& ctx)
    if (value)
       bounds = bounds.move(1, 1);   // Simulate click
 
-   // Render the button using the artist library
+   // Render the button using the library
    cnv.fill_style(colors::dark_slate_blue);
    cnv.fill_round_rect(bounds, 8);
    cnv.line_width(1);

examples/child_window/main.cpp

@@ -6,15 +6,13 @@
 #include <elements.hpp>
 
 using namespace cycfi::elements;
-using namespace cycfi::artist;
 
 // Main window background color
 auto constexpr bkd_color = rgba(35, 35, 37, 255);
 auto background = box(bkd_color);
 
 auto make_child_window(rect bounds, char const* title)
 {
-   using cycfi::elements::image;
    return closable_child_window(
       title,
       bounds,

examples/custom_control/main.cpp

@@ -7,7 +7,6 @@
 #include <infra/support.hpp>
 
 using namespace cycfi::elements;
-using namespace cycfi::artist;
 using namespace cycfi;
 
 auto constexpr bkd_color = rgba(35, 35, 37, 255);
@@ -216,7 +215,6 @@ class my_app : public app
 
 auto my_app::make_control()
 {
-   using cycfi::elements::image;
    return
       layer(
          align_center_middle(

examples/dialogs/main.cpp

@@ -7,7 +7,6 @@
 
 using namespace cycfi::elements;
 using namespace std::chrono_literals;
-using cycfi::artist::rgba;
 
 // Main window background color
 auto constexpr bkd_color = rgba(35, 35, 37, 255);