Some macOS minor fixes.

premake4.lua

@@ -1063,6 +1063,8 @@ solution "eepp"
 
 		if not os.is("windows") and not os.is("haiku") then
 			links { "pthread" }
+		elseif os.is("macosx") then
+			links { "CoreFoundation.framework", "CoreServices.framework" }
 		end
 
 		links { "efsw-static", "pugixml-static" }

projects/osx/ee.files

@@ -1,10 +1,16 @@
 ../../README.md
+../../TODO.md
+../../bin/assets/colorschemes/colorschemes.conf
 ../../bin/assets/ee.ini
 ../../bin/assets/layouts/imported.css
 ../../bin/assets/layouts/test.css
 ../../bin/assets/layouts/test.xml
+../../bin/assets/layouts/test2.xml
 ../../bin/assets/layouts/test_widgets.xml
+../../bin/assets/ui/breeze.css
 ../../bin/assets/ui/uitheme.css
+../../docs/articles/cssspecification.md
+../../docs/articles/uiintroduction.md
 ../../external_projects.lua
 ../../include/eepp/audio/alresource.hpp
 ../../include/eepp/audio/audiodevice.hpp
@@ -59,6 +65,7 @@
 ../../include/eepp/graphics/globalbatchrenderer.hpp
 ../../include/eepp/graphics/globaltextureatlas.hpp
 ../../include/eepp/graphics.hpp
+../../include/eepp/graphics/glyphdrawable.hpp
 ../../include/eepp/graphics/image.hpp
 ../../include/eepp/graphics/ninepatch.hpp
 ../../include/eepp/graphics/ninepatchmanager.hpp
@@ -227,6 +234,7 @@
 ../../include/eepp/system/condition.hpp
 ../../include/eepp/system/container.hpp
 ../../include/eepp/system/directorypack.hpp
+../../include/eepp/system/fileinfo.hpp
 ../../include/eepp/system/filesystem.hpp
 ../../include/eepp/system.hpp
 ../../include/eepp/system/functionstring.hpp
@@ -241,6 +249,7 @@
 ../../include/eepp/system/iostreamzip.hpp
 ../../include/eepp/system/lock.hpp
 ../../include/eepp/system/log.hpp
+../../include/eepp/system/luapattern.hpp
 ../../include/eepp/system/md5.hpp
 ../../include/eepp/system/mutex.hpp
 ../../include/eepp/system/pack.hpp
@@ -286,19 +295,30 @@
 ../../include/eepp/thirdparty/chipmunk/cpSpatialIndex.h
 ../../include/eepp/thirdparty/chipmunk/cpVect.h
 ../../include/eepp/thirdparty/PlusCallback/callback.hpp
+../../include/eepp/ui/models/model.hpp
+../../include/eepp/ui/abstract/uiabstracttableview.hpp
+../../include/eepp/ui/abstract/uiabstractview.hpp
 ../../include/eepp/ui/base.hpp
 ../../include/eepp/ui.hpp
+../../include/eepp/ui/models/modeleditingdelegate.hpp
+../../include/eepp/ui/models/modelindex.hpp
+../../include/eepp/ui/models/modelselection.hpp
+../../include/eepp/ui/border.hpp
+../../include/eepp/ui/css/animationdefinition.hpp
+../../include/eepp/ui/css/drawableimageparser.hpp
+../../include/eepp/ui/css/elementdefinition.hpp
+../../include/eepp/ui/css/keyframesdefinition.hpp
 ../../include/eepp/ui/css/mediaquery.hpp
 ../../include/eepp/ui/css/propertydefinition.hpp
+../../include/eepp/ui/css/propertyidset.hpp
 ../../include/eepp/ui/css/propertyspecification.hpp
 ../../include/eepp/ui/css/shorthanddefinition.hpp
 ../../include/eepp/ui/css/stylesheet.hpp
-../../include/eepp/ui/css/stylesheetelement.hpp
 ../../include/eepp/ui/css/stylesheetlength.hpp
 ../../include/eepp/ui/css/stylesheetparser.hpp
 ../../include/eepp/ui/css/stylesheetpropertiesparser.hpp
 ../../include/eepp/ui/css/stylesheetproperty.hpp
-../../include/eepp/ui/css/stylesheetpropertytransition.hpp
+../../include/eepp/ui/css/stylesheetpropertyanimation.hpp
 ../../include/eepp/ui/css/stylesheetselector.hpp
 ../../include/eepp/ui/css/stylesheetselectorparser.hpp
 ../../include/eepp/ui/css/stylesheetselectorrule.hpp
@@ -306,17 +326,42 @@
 ../../include/eepp/ui/css/stylesheetstyle.hpp
 ../../include/eepp/ui/css/stylesheetvariable.hpp
 ../../include/eepp/ui/css/transitiondefinition.hpp
+../../include/eepp/ui/doc/syntaxcolorscheme.hpp
+../../include/eepp/ui/doc/syntaxdefinition.hpp
+../../include/eepp/ui/doc/syntaxdefinitionmanager.hpp
+../../include/eepp/ui/doc/syntaxhighlighter.hpp
+../../include/eepp/ui/doc/syntaxtokenizer.hpp
+../../include/eepp/ui/doc/textdocument.hpp
+../../include/eepp/ui/doc/textdocumentline.hpp
+../../include/eepp/ui/doc/textposition.hpp
+../../include/eepp/ui/doc/textrange.hpp
+../../include/eepp/ui/doc/undostack.hpp
+../../include/eepp/ui/keyboardshortcut.hpp
 ../../include/eepp/ui/marginmove/scale.hpp
+../../include/eepp/ui/models/filesystemmodel.hpp
+../../include/eepp/ui/models/itemlistmodel.hpp
+../../include/eepp/ui/models/model.hpp
+../../include/eepp/ui/models/modelindex.hpp
+../../include/eepp/ui/models/modelselection.hpp
+../../include/eepp/ui/models/widgettreemodel.hpp
 ../../include/eepp/ui/tools/textureatlaseditor.hpp
+../../include/eepp/ui/tools/uicodeeditorsplitter.hpp
 ../../include/eepp/ui/tools/uicolorpicker.hpp
+../../include/eepp/ui/uiabstractview.hpp
+../../include/eepp/ui/uibackgrounddrawable.hpp
+../../include/eepp/ui/uiborderdrawable.hpp
 ../../include/eepp/ui/uicheckbox.hpp
+../../include/eepp/ui/uicodeeditor.hpp
 ../../include/eepp/ui/uicombobox.hpp
-../../include/eepp/ui/uicommondialog.hpp
 ../../include/eepp/ui/uidropdownlist.hpp
 ../../include/eepp/ui/uieventdispatcher.hpp
+../../include/eepp/ui/uifiledialog.hpp
 ../../include/eepp/ui/uifontstyleconfig.hpp
 ../../include/eepp/ui/uigridlayout.hpp
 ../../include/eepp/ui/uihelper.hpp
+../../include/eepp/ui/uiicon.hpp
+../../include/eepp/ui/uiicontheme.hpp
+../../include/eepp/ui/uiiconthememanager.hpp
 ../../include/eepp/ui/uiimage.hpp
 ../../include/eepp/ui/uiitemcontainer.hpp
 ../../include/eepp/ui/uilayout.hpp
@@ -325,9 +370,11 @@
 ../../include/eepp/ui/uilistboxitem.hpp
 ../../include/eepp/ui/uiloader.hpp
 ../../include/eepp/ui/uimanager.hpp
+../../include/eepp/ui/uimenubar.hpp
 ../../include/eepp/ui/uimenucheckbox.hpp
 ../../include/eepp/ui/uimenu.hpp
 ../../include/eepp/ui/uimenuitem.hpp
+../../include/eepp/ui/uimenuradiobutton.hpp
 ../../include/eepp/ui/uimenuseparator.hpp
 ../../include/eepp/ui/uimenusubmenu.hpp
 ../../include/eepp/ui/uimessagebox.hpp
@@ -339,6 +386,7 @@
 ../../include/eepp/ui/uiradiobutton.hpp
 ../../include/eepp/ui/uirelativelayout.hpp
 ../../include/eepp/ui/uiscenenode.hpp
+../../include/eepp/ui/uiscrollablewidget.hpp
 ../../include/eepp/ui/uiscrollbar.hpp
 ../../include/eepp/ui/uiscrollview.hpp
 ../../include/eepp/ui/uiselectbutton.hpp
@@ -346,12 +394,15 @@
 ../../include/eepp/ui/uiskinstate.hpp
 ../../include/eepp/ui/uislider.hpp
 ../../include/eepp/ui/uispinbox.hpp
+../../include/eepp/ui/uisplitter.hpp
 ../../include/eepp/ui/uisprite.hpp
 ../../include/eepp/ui/uistate.hpp
 ../../include/eepp/ui/uistyle.hpp
 ../../include/eepp/ui/uitab.hpp
 ../../include/eepp/ui/uitablecell.hpp
-../../include/eepp/ui/uitable.hpp
+../../include/eepp/ui/uitableheadercolumn.hpp
+../../include/eepp/ui/uitablerow.hpp
+../../include/eepp/ui/uitableview.hpp
 ../../include/eepp/ui/uitabwidget.hpp
 ../../include/eepp/ui/uitextedit.hpp
 ../../include/eepp/ui/uitextinput.hpp
@@ -361,11 +412,14 @@
 ../../include/eepp/ui/uitheme.hpp
 ../../include/eepp/ui/uithememanager.hpp
 ../../include/eepp/ui/uitooltip.hpp
-../../include/eepp/ui/uitouchdragablewidget.hpp
+../../include/eepp/ui/uitouchdraggablewidget.hpp
+../../include/eepp/ui/uitreeview.hpp
+../../include/eepp/ui/uiviewpager.hpp
 ../../include/eepp/ui/uiwidgetcreator.hpp
 ../../include/eepp/ui/uiwidget.hpp
+../../include/eepp/ui/uiwidgettable.hpp
+../../include/eepp/ui/uiwidgettablerow.hpp
 ../../include/eepp/ui/uiwindow.hpp
-../../include/eepp/ui/uiwinmenu.hpp
 ../../include/eepp/version.hpp
 ../../include/eepp/window/base.hpp
 ../../include/eepp/window/clipboard.hpp
@@ -480,6 +534,7 @@
 ../../src/eepp/graphics/framebuffermanager.hpp
 ../../src/eepp/graphics/globalbatchrenderer.cpp
 ../../src/eepp/graphics/globaltextureatlas.cpp
+../../src/eepp/graphics/glyphdrawable.cpp
 ../../src/eepp/graphics/image.cpp
 ../../src/eepp/graphics/ninepatch.cpp
 ../../src/eepp/graphics/ninepatchmanager.cpp
@@ -668,6 +723,7 @@
 ../../src/eepp/system/compression.cpp
 ../../src/eepp/system/condition.cpp
 ../../src/eepp/system/directorypack.cpp
+../../src/eepp/system/fileinfo.cpp
 ../../src/eepp/system/filesystem.cpp
 ../../src/eepp/system/functionstring.cpp
 ../../src/eepp/system/inifile.cpp
@@ -680,6 +736,9 @@
 ../../src/eepp/system/iostreamzip.cpp
 ../../src/eepp/system/lock.cpp
 ../../src/eepp/system/log.cpp
+../../src/eepp/system/lua-str.cpp
+../../src/eepp/system/lua-str.hpp
+../../src/eepp/system/luapattern.cpp
 ../../src/eepp/system/md5.cpp
 ../../src/eepp/system/mutex.cpp
 ../../src/eepp/system/objectloader.cpp
@@ -717,6 +776,16 @@
 ../../src/eepp/system/translator.cpp
 ../../src/eepp/system/virtualfilesystem.cpp
 ../../src/eepp/system/zip.cpp
+../../src/eepp/ui/abstract/filesystemmodel.hpp
+../../src/eepp/ui/models/model.cpp
+../../src/eepp/ui/models/modelselection.cpp
+../../src/eepp/ui/abstract/uiabstracttableview.cpp
+../../src/eepp/ui/abstract/uiabstractview.cpp
+../../src/eepp/ui/border.cpp
+../../src/eepp/ui/css/animationdefinition.cpp
+../../src/eepp/ui/css/drawableimageparser.cpp
+../../src/eepp/ui/css/elementdefinition.cpp
+../../src/eepp/ui/css/keyframesdefinition.cpp
 ../../src/eepp/ui/css/mediaquery.cpp
 ../../src/eepp/ui/css/propertydefinition.cpp
 ../../src/eepp/ui/css/propertyspecification.cpp
@@ -726,7 +795,7 @@
 ../../src/eepp/ui/css/stylesheetparser.cpp
 ../../src/eepp/ui/css/stylesheetpropertiesparser.cpp
 ../../src/eepp/ui/css/stylesheetproperty.cpp
-../../src/eepp/ui/css/stylesheetpropertytransition.cpp
+../../src/eepp/ui/css/stylesheetpropertyanimation.cpp
 ../../src/eepp/ui/css/stylesheetselector.cpp
 ../../src/eepp/ui/css/stylesheetselectorparser.cpp
 ../../src/eepp/ui/css/stylesheetselectorrule.cpp
@@ -734,18 +803,38 @@
 ../../src/eepp/ui/css/stylesheetstyle.cpp
 ../../src/eepp/ui/css/stylesheetvariable.cpp
 ../../src/eepp/ui/css/transitiondefinition.cpp
+../../src/eepp/ui/doc/syntaxcolorscheme.cpp
+../../src/eepp/ui/doc/syntaxdefinition.cpp
+../../src/eepp/ui/doc/syntaxdefinitionmanager.cpp
+../../src/eepp/ui/doc/syntaxhighlighter.cpp
+../../src/eepp/ui/doc/syntaxtokenizer.cpp
+../../src/eepp/ui/doc/textdocument.cpp
+../../src/eepp/ui/doc/undostack.cpp
+../../src/eepp/ui/keyboardshortcut.cpp
+../../src/eepp/ui/models/filesystemmodel.cpp
+../../src/eepp/ui/models/model.cpp
+../../src/eepp/ui/models/modelselection.cpp
+../../src/eepp/ui/models/widgettreemodel.cpp
 ../../src/eepp/ui/tools/textureatlaseditor.cpp
 ../../src/eepp/ui/tools/textureatlasnew.cpp
 ../../src/eepp/ui/tools/textureatlasnew.hpp
 ../../src/eepp/ui/tools/textureatlastextureregioneditor.cpp
 ../../src/eepp/ui/tools/textureatlastextureregioneditor.hpp
+../../src/eepp/ui/tools/uicodeeditorsplitter.cpp
 ../../src/eepp/ui/tools/uicolorpicker.cpp
+../../src/eepp/ui/uiabstractview.cpp
+../../src/eepp/ui/uibackgrounddrawable.cpp
+../../src/eepp/ui/uiborderdrawable.cpp
 ../../src/eepp/ui/uicheckbox.cpp
+../../src/eepp/ui/uicodeeditor.cpp
 ../../src/eepp/ui/uicombobox.cpp
-../../src/eepp/ui/uicommondialog.cpp
 ../../src/eepp/ui/uidropdownlist.cpp
 ../../src/eepp/ui/uieventdispatcher.cpp
+../../src/eepp/ui/uifiledialog.cpp
 ../../src/eepp/ui/uigridlayout.cpp
+../../src/eepp/ui/uiicon.cpp
+../../src/eepp/ui/uiicontheme.cpp
+../../src/eepp/ui/uiiconthememanager.cpp
 ../../src/eepp/ui/uiimage.cpp
 ../../src/eepp/ui/uilayout.cpp
 ../../src/eepp/ui/uilinearlayout.cpp
@@ -753,9 +842,11 @@
 ../../src/eepp/ui/uilistboxitem.cpp
 ../../src/eepp/ui/uiloader.cpp
 ../../src/eepp/ui/uimanager.cpp
+../../src/eepp/ui/uimenubar.cpp
 ../../src/eepp/ui/uimenucheckbox.cpp
 ../../src/eepp/ui/uimenu.cpp
 ../../src/eepp/ui/uimenuitem.cpp
+../../src/eepp/ui/uimenuradiobutton.cpp
 ../../src/eepp/ui/uimenuseparator.cpp
 ../../src/eepp/ui/uimenusubmenu.cpp
 ../../src/eepp/ui/uimessagebox.cpp
@@ -767,6 +858,7 @@
 ../../src/eepp/ui/uiradiobutton.cpp
 ../../src/eepp/ui/uirelativelayout.cpp
 ../../src/eepp/ui/uiscenenode.cpp
+../../src/eepp/ui/uiscrollablewidget.cpp
 ../../src/eepp/ui/uiscrollbar.cpp
 ../../src/eepp/ui/uiscrollview.cpp
 ../../src/eepp/ui/uiselectbutton.cpp
@@ -774,12 +866,13 @@
 ../../src/eepp/ui/uiskinstate.cpp
 ../../src/eepp/ui/uislider.cpp
 ../../src/eepp/ui/uispinbox.cpp
+../../src/eepp/ui/uisplitter.cpp
 ../../src/eepp/ui/uisprite.cpp
 ../../src/eepp/ui/uistate.cpp
 ../../src/eepp/ui/uistyle.cpp
 ../../src/eepp/ui/uitab.cpp
-../../src/eepp/ui/uitablecell.cpp
-../../src/eepp/ui/uitable.cpp
+../../src/eepp/ui/uitableheadercolumn.cpp
+../../src/eepp/ui/uitableview.cpp
 ../../src/eepp/ui/uitabwidget.cpp
 ../../src/eepp/ui/uitextedit.cpp
 ../../src/eepp/ui/uitextinput.cpp
@@ -789,11 +882,14 @@
 ../../src/eepp/ui/uitheme.cpp
 ../../src/eepp/ui/uithememanager.cpp
 ../../src/eepp/ui/uitooltip.cpp
-../../src/eepp/ui/uitouchdragablewidget.cpp
+../../src/eepp/ui/uitouchdraggablewidget.cpp
+../../src/eepp/ui/uitreeview.cpp
+../../src/eepp/ui/uiviewpager.cpp
 ../../src/eepp/ui/uiwidget.cpp
 ../../src/eepp/ui/uiwidgetcreator.cpp
+../../src/eepp/ui/uiwidgettable.cpp
+../../src/eepp/ui/uiwidgettablerow.cpp
 ../../src/eepp/ui/uiwindow.cpp
-../../src/eepp/ui/uiwinmenu.cpp
 ../../src/eepp/window/backend/allegro5/cbackendal.hpp
 ../../src/eepp/window/backend/allegro5/cclipboardal.cpp
 ../../src/eepp/window/backend/allegro5/cclipboardal.hpp
@@ -888,7 +984,11 @@
 ../../src/examples/ui_hello_world/ui_hello_world.cpp
 ../../src/examples/vbo_fbo_batch/vbo_fbo_batch.cpp
 ../../src/test/eetest.cpp
-../../src/test/eetest.hpp
+../../src/tests/test_all/test.cpp
+../../src/tests/test_all/test.hpp
+../../src/tests/test_everything/test.cpp
+../../src/tests/test_everything/test.hpp
+../../src/tests/ui_perf_test/ui_perf_test.cpp
 ../../src/thirdparty/SOIL2/src/SOIL2/etc1_utils.c
 ../../src/thirdparty/SOIL2/src/SOIL2/etc1_utils.h
 ../../src/thirdparty/SOIL2/src/SOIL2/image_DXT.c
@@ -909,6 +1009,19 @@
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm.h
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr_c.h
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr.h
+../../src/tools/codeeditor/autocompletemodule.cpp
+../../src/tools/codeeditor/autocompletemodule.hpp
+../../src/tools/codeeditor/codeeditor.cpp
+../../src/tools/codeeditor/codeeditor.hpp
+../../src/tools/codeeditor/ignorematcher.cpp
+../../src/tools/codeeditor/ignorematcher.hpp
+../../src/tools/codeeditor/projectdirectorytree.cpp
+../../src/tools/codeeditor/projectdirectorytree.hpp
+../../src/tools/codeeditor/projectsearch.cpp
+../../src/tools/codeeditor/projectsearch.hpp
+../../src/tools/codeeditor/uicodeeditorsplitter.cpp
+../../src/tools/codeeditor/uicodeeditorsplitter.hpp
 ../../src/tools/mapeditor/mapeditor.cpp
 ../../src/tools/textureatlaseditor/textureatlaseditor.cpp
+../../src/tools/texturepacker/texturepacker.cpp
 ../../src/tools/uieditor/uieditor.cpp

src/tools/codeeditor/codeeditor.cpp

@@ -2100,7 +2100,6 @@ void App::init( const std::string& file, const Float& pidelDensity ) {
 		addIcon( "quit", 0xeb97 );
 		addIcon( "undo", 0xea58 );
 		addIcon( "redo", 0xea5a );
-		addIcon( "redo", 0xea5a );
 		addIcon( "cut", 0xf0c1 );
 		addIcon( "copy", 0xecd5 );
 		addIcon( "paste", 0xeb91 );

src/tools/codeeditor/ignorematcher.cpp

@@ -143,6 +143,8 @@ IgnoreMatcher::IgnoreMatcher( const std::string& rootPath ) : mPath( rootPath )
 	FileSystem::dirAddSlashAtEnd( mPath );
 }
 
+IgnoreMatcher::~IgnoreMatcher() {}
+
 GitIgnoreMatcher::GitIgnoreMatcher( const std::string& rootPath ) : IgnoreMatcher( rootPath ) {
 	if ( canMatch() )
 		parse();

src/tools/codeeditor/ignorematcher.hpp

@@ -1,4 +1,4 @@
-#ifndef EE_TOOLS_IGNOREMATHCER_HPP
+#ifndef EE_TOOLS_IGNOREMATCHER_HPP
 #define EE_TOOLS_IGNOREMATCHER_HPP
 
 #include <eepp/system/filesystem.hpp>
@@ -12,6 +12,8 @@ class IgnoreMatcher {
   public:
 	IgnoreMatcher( const std::string& rootPath );
 
+	virtual ~IgnoreMatcher();
+
 	virtual bool canMatch() = 0;
 
 	virtual bool match( const std::string& value ) = 0;