Implemented UIFontPickerDialog.

Fixed alignment in UILinearLayout when padding is used.

Author: SpartanJ

.ecode/project_build.json

@@ -381,6 +381,12 @@
         "command": "${project_root}/bin/eepp-ui-html-debug",
         "name": "eepp-ui-html-debug",
         "working_dir": "${project_root}/bin"
+      },
+      {
+        "args": "",
+        "command": "${project_root}/bin/eepp-ui-font-picker-debug",
+        "name": "eepp-ui-font-picker-debug",
+        "working_dir": "${project_root}/bin"
       }
     ],
     "var": {

include/eepp/graphics/fonttruetype.hpp

@@ -35,6 +35,8 @@ class EE_API FontTrueType : public Font {
 
 	const Font::Info& getInfo() const;
 
+	const Uint32& getFaceIndex() const { return mFaceIndex; }
+
 	Glyph getGlyph( Uint32 codePoint, unsigned int characterSize, bool bold, bool italic,
 					Float outlineThickness = 0 ) const;
 

include/eepp/scene/event.hpp

@@ -131,6 +131,7 @@ class EE_API Event {
 		OnFocusWithin,
 		OnFocusWithinLoss,
 		OnItemsCountChange,
+		OnApply,
 		NoEvent = eeINDEX_NOT_FOUND
 	};
 

include/eepp/ui.hpp

@@ -74,6 +74,7 @@
 #include <eepp/ui/tools/uicolorpicker.hpp>
 #include <eepp/ui/tools/uidiffview.hpp>
 #include <eepp/ui/tools/uidocfindreplace.hpp>
+#include <eepp/ui/tools/uifontpickerdialog.hpp>
 #include <eepp/ui/tools/uiimageviewer.hpp>
 #include <eepp/ui/tools/uiwidgetinspector.hpp>
 #include <eepp/ui/uiapplication.hpp>
@@ -141,7 +142,6 @@
 #include <eepp/ui/uiscrollablewidget.hpp>
 #include <eepp/ui/uiscrollbar.hpp>
 #include <eepp/ui/uiscrollview.hpp>
-#include <eepp/ui/uiwebview.hpp>
 #include <eepp/ui/uiselectbutton.hpp>
 #include <eepp/ui/uiskin.hpp>
 #include <eepp/ui/uiskinstate.hpp>
@@ -172,6 +172,7 @@
 #include <eepp/ui/uitouchdraggablewidget.hpp>
 #include <eepp/ui/uitreeview.hpp>
 #include <eepp/ui/uiviewpager.hpp>
+#include <eepp/ui/uiwebview.hpp>
 #include <eepp/ui/uiwidget.hpp>
 #include <eepp/ui/uiwidgetcreator.hpp>
 #include <eepp/ui/uiwidgettable.hpp>

include/eepp/ui/tools/uifontpickerdialog.hpp

@@ -0,0 +1,192 @@
+#ifndef EE_UI_TOOLS_UIFONTPICKERDIALOG_HPP
+#define EE_UI_TOOLS_UIFONTPICKERDIALOG_HPP
+
+#include <atomic>
+#include <eepp/graphics/systemfontresolver.hpp>
+#include <eepp/system/color.hpp>
+#include <eepp/ui/keyboardshortcut.hpp>
+#include <eepp/ui/models/model.hpp>
+#include <eepp/ui/uiwindow.hpp>
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace EE { namespace UI {
+class UICheckBox;
+class UIFileDialog;
+class UILoader;
+class UIListView;
+class UIPushButton;
+class UITextInput;
+class UITextView;
+}} // namespace EE::UI
+
+namespace EE { namespace UI { namespace Tools {
+
+class UIColorPicker;
+
+struct UIFontSelection {
+	FontDesc font;
+	Uint32 size{ 12 };
+	bool underline{ false };
+	bool strikeThrough{ false };
+	bool antialiasing{ true };
+	Color color{ Color::White };
+};
+
+class EE_API UIFontPickerDialog : public UIWindow {
+  public:
+	using FontPickedCb = std::function<void( const UIFontSelection& )>;
+
+	enum Flags {
+		MonospaceOnly = 1 << 0,
+		ShowSize = 1 << 1,
+		ShowEffects = 1 << 2,
+		ShowColor = 1 << 3,
+		ShowApplyButton = 1 << 4,
+		DefaultFlags = ShowSize | ShowEffects | ShowColor,
+	};
+
+	struct FontStyleEntry {
+		std::string label;
+		FontDesc desc;
+	};
+
+	static UIFontPickerDialog* New( Uint32 flags = DefaultFlags );
+
+	virtual ~UIFontPickerDialog();
+
+	virtual Uint32 getType() const;
+
+	virtual bool isType( const Uint32& type ) const;
+
+	virtual void setTheme( UITheme* theme );
+
+	void setSelectedFont( const FontDesc& desc );
+
+	void setSelectedFont( const std::string& path, Uint32 faceIndex = 0 );
+
+	const UIFontSelection& getSelection() const;
+
+	void setSelection( const UIFontSelection& selection );
+
+	void setOnFontPicked( FontPickedCb cb );
+
+	UIPushButton* getButtonOK() const;
+
+	UIPushButton* getButtonCancel() const;
+
+	UIPushButton* getButtonApply() const;
+
+	UIPushButton* getButtonBrowse() const;
+
+	UITextInput* getSearchInput() const;
+
+	UIListView* getFamilyList() const;
+
+	UIListView* getStyleList() const;
+
+	UIListView* getSizeList() const;
+
+	const KeyBindings::Shortcut& getCloseShortcut() const;
+
+	void setCloseShortcut( const KeyBindings::Shortcut& closeShortcut );
+
+	virtual bool show();
+
+  protected:
+	Uint32 mFlags{ DefaultFlags };
+	KeyBindings::Shortcut mCloseShortcut{ KEY_UNKNOWN };
+	UIFontSelection mSelection;
+	FontPickedCb mFontPickedCb;
+	std::vector<FontDesc> mFonts;
+	std::vector<std::string> mFamilies;
+	std::vector<FontStyleEntry> mStyles;
+	std::vector<Uint32> mSizes;
+	std::shared_ptr<Models::Model> mFamilyModel;
+	std::shared_ptr<Models::Model> mStyleModel;
+	std::shared_ptr<Models::Model> mSizeModel;
+	UIWidget* mFontContent{ nullptr };
+	UILoader* mFontLoader{ nullptr };
+	UITextInput* mSearchInput{ nullptr };
+	UIListView* mFamilyList{ nullptr };
+	UIListView* mStyleList{ nullptr };
+	UIListView* mSizeList{ nullptr };
+	UITextView* mPreviewText{ nullptr };
+	UITextInput* mPreviewInput{ nullptr };
+	UITextView* mDetailsText{ nullptr };
+	UIColorPicker* mColorPicker{ nullptr };
+	UIFileDialog* mBrowseDialog{ nullptr };
+	Uint32 mColorPickerCloseCb{ 0 };
+	Uint32 mBrowseDialogCloseCb{ 0 };
+	Uint32 mBrowseDialogOpenCb{ 0 };
+	UICheckBox* mMonospaceOnly{ nullptr };
+	UICheckBox* mAntialiasing{ nullptr };
+	UICheckBox* mUnderline{ nullptr };
+	UICheckBox* mStrikeThrough{ nullptr };
+	UIPushButton* mColorButton{ nullptr };
+	UIPushButton* mButtonOK{ nullptr };
+	UIPushButton* mButtonCancel{ nullptr };
+	UIPushButton* mButtonApply{ nullptr };
+	UIPushButton* mButtonBrowse{ nullptr };
+	bool mUpdating{ false };
+	bool mLoadingFonts{ false };
+	Uint64 mLoadFontsTaskId{ 0 };
+
+	struct LoadFontsRequest {
+		std::atomic<bool> alive{ true };
+		std::atomic<UIFontPickerDialog*> dialog{ nullptr };
+	};
+	std::shared_ptr<LoadFontsRequest> mLoadFontsRequest;
+
+	UIFontPickerDialog( Uint32 flags = DefaultFlags );
+
+	virtual void onWindowReady();
+
+	virtual Uint32 onKeyUp( const KeyEvent& event );
+
+	virtual Uint32 onMessage( const NodeMessage* msg );
+
+	void loadWidgets();
+
+	void loadFonts();
+
+	void setFonts( std::vector<FontDesc> fonts );
+
+	void sortFonts();
+
+	void setFontsLoading( bool loading );
+
+	void updateFamilies();
+
+	void updateStyles();
+
+	void updateSelectionFromLists();
+
+	void updatePreview();
+
+	void selectInitialRows();
+
+	void selectFamily( const std::string& family );
+
+	void selectStyle( const FontDesc& desc );
+
+	void selectSize( Uint32 size );
+
+	void emitPicked();
+
+	void pickColor();
+
+	void browseFont();
+
+	bool addExternalFont( const std::string& path, Uint32 faceIndex = 0 );
+
+	void clearBrowseDialog();
+
+	bool wantsMonospaceOnly() const;
+};
+
+}}} // namespace EE::UI::Tools
+
+#endif

include/eepp/ui/uihelper.hpp

@@ -138,6 +138,7 @@ enum UINodeType {
 	UI_TYPE_WEBVIEW,
 	UI_TYPE_SVG,
 	UI_TYPE_TEXTNODE,
+	UI_TYPE_FONTPICKERDIALOG,
 	UI_TYPE_MODULES = 10000,
 	UI_TYPE_TERMINAL = 10001,
 	UI_TYPE_USER = 200000,

premake4.lua

@@ -1669,6 +1669,12 @@ solution "eepp"
 		files { "src/examples/ui_application_hello_world/*.cpp" }
 		build_link_configuration( "eepp-ui-application-hello-world", true )
 
+	project "eepp-ui-font-picker"
+		set_kind()
+		language "C++"
+		files { "src/examples/ui_font_picker/*.cpp" }
+		build_link_configuration( "eepp-ui-font-picker", true )
+
 	project "eepp-ui-dropdownmodellist"
 		set_kind()
 		language "C++"

premake5.lua

@@ -1662,6 +1662,12 @@ workspace "eepp"
 		files { "src/examples/ui_application_hello_world/*.cpp" }
 		build_link_configuration( "eepp-ui-application-hello-world", true )
 
+	project "eepp-ui-font-picker"
+		set_kind()
+		language "C++"
+		files { "src/examples/ui_font_picker/*.cpp" }
+		build_link_configuration( "eepp-ui-font-picker", true )
+
 	project "eepp-ui-dropdownmodellist"
 		set_kind()
 		language "C++"

src/eepp/graphics/fontmanager.cpp

@@ -111,7 +111,8 @@ FontTrueType* FontManager::getOrLoadSystemFallbackFont( const FontDesc& desc ) {
 	for ( auto* font : mSystemFallbackFonts ) {
 		if ( font->getType() == FontType::TTF ) {
 			auto* ttf = static_cast<FontTrueType*>( font );
-			if ( ttf->getInfo().fontpath + ttf->getInfo().filename == desc.path )
+			if ( ttf->getInfo().fontpath + ttf->getInfo().filename == desc.path &&
+				 ttf->getFaceIndex() == desc.faceIndex )
 				return ttf;
 		}
 	}