Browse Source

Enable font effects in default font implementation.

Michael Ragazzon 6 years ago
parent
commit
08742e23bd

+ 1 - 1
Include/RmlUi/Core/FontSubsystemInterface.h

@@ -69,7 +69,7 @@ public:
 	/// @param[in] FontHandle
 	/// @param[in] font_effects The list of font effects to generate the configuration for.
 	/// @return The index to use when generating geometry using this configuration.
-	virtual int GenerateLayerConfiguration(FontFaceHandle, const String &font_effects) const;
+	virtual int GenerateLayerConfiguration(FontFaceHandle, const FontEffectList &font_effects) const;
 
 	/// Returns the average advance of all glyphs in this font face.
 	/// @param[in] FontHandle

+ 1 - 2
Source/Core/ElementTextDefault.cpp

@@ -384,8 +384,7 @@ bool ElementTextDefault::UpdateFontConfiguration()
 
 	// Request a font layer configuration to match this set of effects. If this is different from
 	// our old configuration, then return true to indicate we'll need to regenerate geometry.
-	//int new_configuration = GetFontSubsystemInterface()->GenerateLayerConfiguration(GetFontFaceHandle(), font_effects->);
-	int new_configuration = 0;
+	int new_configuration = GetFontSubsystemInterface()->GenerateLayerConfiguration(GetFontFaceHandle(), *font_effects);
 	if (new_configuration != font_configuration)
 	{
 		font_configuration = new_configuration;

+ 1 - 1
Source/Core/FontSubsystemInterface.cpp

@@ -61,7 +61,7 @@ FontFaceHandle FontSubsystemInterface::GetFontFaceHandle(const String& RMLUI_UNU
 	return 0;
 }
 	
-int FontSubsystemInterface::GenerateLayerConfiguration(FontFaceHandle, const String &font_effects) const
+int FontSubsystemInterface::GenerateLayerConfiguration(FontFaceHandle, const FontEffectList& font_effects) const
 {
 	return 0;
 }

+ 2 - 10
Source/Core/FontSubsystemInterfaceDefault.cpp

@@ -63,18 +63,10 @@ FontFaceHandle FontSubsystemInterfaceDefault::GetFontFaceHandle(const String& fa
 	return reinterpret_cast<FontFaceHandle>(handle.get());
 }
 	
-int FontSubsystemInterfaceDefault::GenerateLayerConfiguration(FontFaceHandle handle, const String &font_effects) const
+int FontSubsystemInterfaceDefault::GenerateLayerConfiguration(FontFaceHandle handle, const FontEffectList& font_effects) const
 {
-#if 0
 	auto handle_default = reinterpret_cast<FontFaceHandleDefault *>(handle);
-	
-	Variant<FontEffectsPtr> fontVar;
-	fontVar.Set(font_effects);
-
-	return handle_default->GenerateLayerConfiguration(fontVar.Get());
-#else
-	return 0;
-#endif
+	return handle_default->GenerateLayerConfiguration(font_effects);
 }
 
 int FontSubsystemInterfaceDefault::GetCharacterWidth(FontFaceHandle handle) const

+ 1 - 1
Source/Core/FontSubsystemInterfaceDefault.h

@@ -66,7 +66,7 @@ public:
     /// @param[in] FontHandle
 	/// @param[in] font_effects The list of font effects to generate the configuration for.
 	/// @return The index to use when generating geometry using this configuration.
-	virtual int GenerateLayerConfiguration(FontFaceHandle, const String &font_effects) const override;
+	virtual int GenerateLayerConfiguration(FontFaceHandle, const FontEffectList& font_effects) const override;
 
 	/// Returns the average advance of all glyphs in this font face.
 	/// @param[in] FontHandle