Merge branch 'main'

Author: djowel

.clang-format

@@ -0,0 +1,4 @@
+---
+AccessModifierOffset: -3
+IndentWidth: 3
+...

.gitmodules

@@ -4,3 +4,6 @@
 [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

CMakeLists.txt

@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2016-2020 Joel de Guzman
+#  Copyright (c) 2016-2023 Joel de Guzman
 #  Copyright (c) 2020 Michał Urbański
 #
 #  Distributed under the MIT License (https://opensource.org/licenses/MIT)
@@ -14,6 +14,13 @@ if(CMAKE_CXX_STANDARD LESS 17)
    set(CMAKE_CXX_STANDARD 17)
 endif()
 
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+   include(GitSubmoduleCheck)
+   git_submodule_check(lib/artist)
+   git_submodule_check(lib/external/asio)
+   git_submodule_check(lib/infra)
+endif()
+
 include(ElementsConfigCommon)
 
 option(ELEMENTS_BUILD_EXAMPLES "build Elements library examples" ON)

README.md

@@ -6,7 +6,7 @@
 
 ## Introduction
 
-Elements is a lightweight, fine-grained, resolution independent, modular GUI library. 
+Elements is a lightweight, fine-grained, resolution independent, modular GUI library.
 Elements is designed with these requirements in mind:
 
 1. It should be open source with a liberal, non-viral license.
@@ -21,7 +21,7 @@ Elements is designed with these requirements in mind:
    tells you *what* rather than *how* (imperative). The GUI should be
    declared in C++ code.
 7. Keep it simple. Make it easy to use right out of the box, with a lot of examples.
-8. Porting to a new host target should be as easy as possible, requiring 
+8. Porting to a new host target should be as easy as possible, requiring
    porting of only a few files.
 
 Elements, is extremely lightweight… and modular. You compose very
@@ -98,5 +98,5 @@ peer-reviewed, Open Source, collaborative development effort.
 
 -------------------------------------------------------------------------------
 
-*Copyright (c) 2014-2022 Joel de Guzman. All rights reserved.*
+*Copyright (c) 2014-2023 Joel de Guzman. All rights reserved.*
 *Distributed under the [MIT License](https://opensource.org/licenses/MIT)*

cmake/ElementsConfigApp.cmake

@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2016-2020 Joel de Guzman
+#  Copyright (c) 2016-2023 Joel de Guzman
 #
 #  Distributed under the MIT License (https://opensource.org/licenses/MIT)
 ###############################################################################
@@ -10,6 +10,7 @@ project(${ELEMENTS_APP_PROJECT} LANGUAGES CXX)
 # Sanitizers
 
 option(ASAN "Build with address sanitizer" OFF)
+option(LSAN "Build with leak sanitizer" OFF)
 option(TSAN "Build with thread sanitizer" OFF)
 option(UBSAN "Build with undefined Behavior sanitizer" OFF)
 
@@ -25,6 +26,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
       add_sanitizer("address")
    endif()
 
+   if (LSAN)
+      add_sanitizer("leak")
+   endif()
+
    if (TSAN)
       add_sanitizer("thread")
    endif()
@@ -33,11 +38,19 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
       add_sanitizer("undefined")
    endif()
 else()
-   if (ASAN OR TSAN OR UBSAN)
+   if (ASAN OR LSAN OR TSAN OR UBSAN)
       message(FATAL_ERROR "Compiler is not supported.")
    endif()
 endif()
 
+###############################################################################
+# Linux Open GL
+
+if (UNIX AND NOT APPLE)
+   find_package(PkgConfig REQUIRED)
+   find_package(OpenGL REQUIRED COMPONENTS OpenGL)
+endif()
+
 ###############################################################################
 # Sources (and Resources)
 
@@ -107,25 +120,29 @@ 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}")
@@ -143,12 +160,17 @@ target_compile_options(${ELEMENTS_APP_PROJECT} PRIVATE
     $<$<CXX_COMPILER_ID:MSVC>:/utf-8>
 )
 
+if (APPLE)
+   target_compile_options(${ELEMENTS_APP_PROJECT} PUBLIC "-fobjc-arc")
+endif()
+
 ###############################################################################
 # Libraries and linking
 
 target_link_libraries(${ELEMENTS_APP_PROJECT} PRIVATE
    ${ELEMENTS_APP_DEPENDENCIES}
    elements
+   ${OPENGL_LIBRARIES}
 )
 
 if (NOT DEFINED ELEMENTS_APP_INCLUDE_DIRECTORIES)

cmake/ElementsConfigCommon.cmake

@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2016-2020 Joel de Guzman
+#  Copyright (c) 2016-2023 Joel de Guzman
 #
 #  Distributed under the MIT License (https://opensource.org/licenses/MIT)
 ###############################################################################

cmake/GitSubmoduleCheck.cmake

@@ -0,0 +1,9 @@
+# https://gist.github.com/scivision/bb1d47a9529e153617414e91ff5390af
+find_package(Git REQUIRED)
+function(git_submodule_check dir)
+   if(NOT EXISTS "${dir}/CMakeLists.txt")
+      execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive -- ${dir}
+         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+         COMMAND_ERROR_IS_FATAL ANY)
+   endif()
+endfunction()

examples/CMakeLists.txt

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

…mples/active_dynamic_list/CMakeLists.txt examples/active_list/CMakeLists.txtexamples/active_dynamic_list/CMakeLists.txt renamed to examples/active_list/CMakeLists.txt examples/active_dynamic_list/CMakeLists.txt renamed to examples/active_list/CMakeLists.txt

@@ -16,10 +16,10 @@ if (NOT ELEMENTS_BUILD_EXAMPLES)
    add_subdirectory(${ELEMENTS_ROOT} elements)
 endif()
 
-set(ELEMENTS_APP_PROJECT "ActiveDynamicList")
-set(ELEMENTS_APP_TITLE "Active Dynamic List")
+set(ELEMENTS_APP_PROJECT "ActiveList")
+set(ELEMENTS_APP_TITLE "Active List")
 set(ELEMENTS_APP_COPYRIGHT "Copyright (c) 2022 Johann Philippe")
-set(ELEMENTS_APP_ID "com.cycfi.active-dynamic-list")
+set(ELEMENTS_APP_ID "com.cycfi.active-list")
 set(ELEMENTS_APP_VERSION "1.0")
 
 set(ELEMENTS_APP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)

examples/active_dynamic_list/main.cpp examples/active_list/main.cppexamples/active_dynamic_list/main.cpp renamed to examples/active_list/main.cpp

@@ -6,6 +6,7 @@
 #include <elements.hpp>
 
 using namespace cycfi::elements;
+using cycfi::artist::rgba;
 
 // Main window background color
 auto constexpr bkd_color = rgba(35, 35, 37, 255);
@@ -24,7 +25,7 @@ struct basic_row : htile_composite
          {
             std::cout << "on text " << std::endl;
          };
-         push_back(share(input.first));
+         push_back(share(hsize(100, input.first)));
       }
    }
 
@@ -33,7 +34,7 @@ struct basic_row : htile_composite
 
 int main(int argc, char* argv[])
 {
-   app _app(argc, argv, "Active Dynamic List", "com.cycfi.active-dynamic-list");
+   app _app(argc, argv, "Active Dynamic List", "com.cycfi.active-list");
    window _win(_app.name());
    _win.on_close = [&_app]() { _app.stop(); };
 
@@ -50,37 +51,38 @@ int main(int argc, char* argv[])
       return ptr_list[index];
    };
 
-   auto cp = basic_vertical_cell_composer(list_size, make_row);
-   auto content = vdynamic_list(cp);
-   auto linked = link(content);
+   auto cp = basic_vcell_composer(list_size, make_row);
+   auto content = vlist(cp);
 
    auto b1 = icon_button(icons::minus, 1);
    auto b2 = icon_button(icons::plus, 1);
 
-   b1.on_click = [&](bool)
-   {
-      std::cout << "dn " << std::endl;
-      if (list_size <= 50)
-         return;
-      list_size -= 50;
-      ptr_list.resize(list_size);
-      content.resize(list_size);
-      view_.refresh();
-   };
+   b1.on_click =
+      [&](bool)
+      {
+         std::cout << "dn " << std::endl;
+         if (list_size <= 50)
+            return;
+         list_size -= 50;
+         ptr_list.resize(list_size);
+         content.resize(list_size);
+         view_.refresh();
+      };
 
-   b2.on_click = [&](bool)
-   {
-      std::cout << "up " << std::endl;
-      list_size +=50;
-      ptr_list.resize(list_size);
-      content.resize(list_size);
-      view_.refresh();
-   };
+   b2.on_click =
+      [&](bool)
+      {
+         std::cout << "up " << std::endl;
+         list_size +=50;
+         ptr_list.resize(list_size);
+         content.resize(list_size);
+         view_.refresh();
+      };
 
    view_.content(
       margin({10, 10, 10, 10},
          vtile(
-            vscroller(hold(share(linked))),
+            vscroller(link(content)),
             htile(b1, b2)
             )
          ),