Added UIFilePickerDialog support for ecode (SpartanJ/ecode#903) and improved the dialog.

Author: SpartanJ

include/eepp/graphics/fonttruetype.hpp

@@ -13,6 +13,8 @@ class IOStream;
 
 namespace EE { namespace Graphics {
 
+struct FontDesc;
+
 class EE_API FontTrueType : public Font {
   public:
 	static FontTrueType* New( const std::string& FontName );
@@ -35,6 +37,8 @@ class EE_API FontTrueType : public Font {
 
 	const Font::Info& getInfo() const;
 
+	bool getFontDesc( FontDesc& desc ) const;
+
 	const Uint32& getFaceIndex() const { return mFaceIndex; }
 
 	Glyph getGlyph( Uint32 codePoint, unsigned int characterSize, bool bold, bool italic,

include/eepp/graphics/systemfontresolver.hpp

@@ -62,6 +62,32 @@ struct FontDesc {
 	FontStretch stretch{ FontStretch::Normal };
 	bool italic{ false };
 	bool monospace{ false };
+
+	std::string getFileKey() const { return path + "#" + String::toString( faceIndex ); }
+
+	std::string getStyleKey() const {
+		return String::toLower( family ) + "#" + String::toString( static_cast<Uint32>( weight ) ) +
+			   "#" + String::toString( static_cast<Uint32>( stretch ) ) + "#" +
+			   String::toString( italic ? 1 : 0 ) + "#" + String::toString( faceIndex );
+	}
+
+	bool sameFile( const FontDesc& other ) const {
+		return path == other.path && faceIndex == other.faceIndex;
+	}
+
+	bool sameFile( const std::string& otherPath, Uint32 otherFaceIndex = 0 ) const {
+		return path == otherPath && faceIndex == otherFaceIndex;
+	}
+
+	bool sameStyle( const FontDesc& other ) const { return getStyleKey() == other.getStyleKey(); }
+
+	bool operator==( const FontDesc& other ) const {
+		return family == other.family && path == other.path && faceIndex == other.faceIndex &&
+			   weight == other.weight && stretch == other.stretch && italic == other.italic &&
+			   monospace == other.monospace;
+	}
+
+	bool operator!=( const FontDesc& other ) const { return !( *this == other ); }
 };
 
 class EE_API SystemFontResolver {

include/eepp/ui/tools/uifontpickerdialog.hpp

@@ -33,11 +33,20 @@ struct UIFontSelection {
 	bool strikeThrough{ false };
 	bool antialiasing{ true };
 	Color color{ Color::White };
+
+	bool operator==( const UIFontSelection& other ) const {
+		return font == other.font && size == other.size && underline == other.underline &&
+			   strikeThrough == other.strikeThrough && antialiasing == other.antialiasing &&
+			   color == other.color;
+	}
+
+	bool operator!=( const UIFontSelection& other ) const { return !( *this == other ); }
 };
 
 class EE_API UIFontPickerDialog : public UIWindow {
   public:
 	using FontPickedCb = std::function<void( const UIFontSelection& )>;
+	using FontSelectionChangedCb = std::function<void( const UIFontSelection& )>;
 
 	enum Flags {
 		MonospaceOnly = 1 << 0,
@@ -73,6 +82,8 @@ class EE_API UIFontPickerDialog : public UIWindow {
 
 	void setOnFontPicked( FontPickedCb cb );
 
+	void setOnFontSelectionChanged( FontSelectionChangedCb cb );
+
 	UIPushButton* getButtonOK() const;
 
 	UIPushButton* getButtonCancel() const;
@@ -100,10 +111,13 @@ class EE_API UIFontPickerDialog : public UIWindow {
 	KeyBindings::Shortcut mCloseShortcut{ KEY_UNKNOWN };
 	UIFontSelection mSelection;
 	FontPickedCb mFontPickedCb;
+	FontSelectionChangedCb mFontSelectionChangedCb;
 	std::vector<FontDesc> mFonts;
 	std::vector<std::string> mFamilies;
 	std::vector<FontStyleEntry> mStyles;
 	std::vector<Uint32> mSizes;
+	UnorderedSet<std::string> mLoadedFontKeys;
+	UnorderedMap<std::string, std::string> mFontTags;
 	std::shared_ptr<Models::Model> mFamilyModel;
 	std::shared_ptr<Models::Model> mStyleModel;
 	std::shared_ptr<Models::Model> mSizeModel;
@@ -125,13 +139,14 @@ class EE_API UIFontPickerDialog : public UIWindow {
 	UICheckBox* mAntialiasing{ nullptr };
 	UICheckBox* mUnderline{ nullptr };
 	UICheckBox* mStrikeThrough{ nullptr };
-	UIPushButton* mColorButton{ nullptr };
+	UIWidget* mColorButton{ nullptr };
 	UIPushButton* mButtonOK{ nullptr };
 	UIPushButton* mButtonCancel{ nullptr };
 	UIPushButton* mButtonApply{ nullptr };
 	UIPushButton* mButtonBrowse{ nullptr };
 	bool mUpdating{ false };
 	bool mLoadingFonts{ false };
+	bool mSelectionColorExplicit{ false };
 	Uint64 mLoadFontsTaskId{ 0 };
 
 	struct LoadFontsRequest {
@@ -156,20 +171,30 @@ class EE_API UIFontPickerDialog : public UIWindow {
 
 	void sortFonts();
 
+	void mergeFontManagerFonts( std::vector<FontDesc>& fonts );
+
+	void updateFontTags();
+
 	void setFontsLoading( bool loading );
 
+	void updateDefaultSelectionColor();
+
 	void updateFamilies();
 
 	void updateStyles();
 
-	void updateSelectionFromLists();
+	void updateSelectionFromLists( bool notify = true );
+
+	void emitSelectionChanged();
 
 	void updatePreview();
 
 	void selectInitialRows();
 
 	void selectFamily( const std::string& family );
 
+	void selectRegularStyle();
+
 	void selectStyle( const FontDesc& desc );
 
 	void selectSize( Uint32 size );

src/eepp/graphics/fonttruetype.cpp

@@ -545,6 +545,20 @@ const FontTrueType::Info& FontTrueType::getInfo() const {
 	return mInfo;
 }
 
+bool FontTrueType::getFontDesc( FontDesc& desc ) const {
+	if ( !loaded() || mInfo.filename.empty() || mInfo.fontpath.empty() )
+		return false;
+
+	desc = FontDesc{};
+	desc.family = mInfo.family.empty() ? getName() : mInfo.family;
+	desc.path = mInfo.fontpath + mInfo.filename;
+	desc.faceIndex = getFaceIndex();
+	desc.weight = isBold() || isBoldItalic() ? FontWeight::Bold : FontWeight::Normal;
+	desc.italic = isItalic() || isBoldItalic();
+	desc.monospace = isIdentifiedAsMonospace();
+	return !desc.family.empty() && !desc.path.empty();
+}
+
 void FontTrueType::updateFontInternalId() {
 	auto fontInternalId = fontsInternalIds.find( mInfo.family );
 	if ( fontsInternalIds.end() == fontInternalId ) {