update TextLayout

src/kiwano/2d/Text.cpp

@@ -126,11 +126,11 @@ namespace kiwano
 		style_.color = color;
 	}
 
-	void Text::SetItalic(bool val)
+	void Text::SetItalic(bool italic)
 	{
-		if (font_.italic != val)
+		if (font_.italic != italic)
 		{
-			font_.italic = val;
+			font_.italic = italic;
 			format_dirty_ = true;
 		}
 	}

src/kiwano/2d/Text.h

@@ -102,7 +102,7 @@ namespace kiwano
 
 		// 设置文字斜体（默认值为 false）
 		void SetItalic(
-			bool val
+			bool italic
 		);
 
 		// 设置文本自动换行的宽度（默认为 0）

src/kiwano/renderer/Renderer.cpp

@@ -706,7 +706,7 @@ namespace kiwano
 		ThrowIfFailed(hr);
 	}
 
-	void Renderer::CreateTextLayout(TextLayout& layout, String const& text, TextStyle const& style, TextFormat const& format)
+	void Renderer::CreateTextLayout(TextLayout& layout, String const& text, TextFormat const& format)
 	{
 		HRESULT hr = S_OK;
 		if (!d2d_res_)
@@ -720,7 +720,6 @@ namespace kiwano
 			hr = d2d_res_->CreateTextLayout(
 				output,
 				text,
-				style,
 				format.GetTextFormat()
 			);
 		}

src/kiwano/renderer/Renderer.h

@@ -138,7 +138,6 @@ namespace kiwano
 		void CreateTextLayout(
 			TextLayout& layout,
 			String const& text,
-			TextStyle const& style,
 			TextFormat const& format
 		);
 

src/kiwano/renderer/TextLayout.cpp

@@ -76,9 +76,73 @@ namespace kiwano
 		Renderer::GetInstance()->CreateTextLayout(
 			*this,
 			text,
-			style,
 			text_format_
 		);
+
+		HRESULT hr = text_layout_ ? S_OK : E_FAIL;
+
+		if (SUCCEEDED(hr))
+		{
+			if (style.line_spacing == 0.f)
+			{
+				hr = text_layout_->SetLineSpacing(DWRITE_LINE_SPACING_METHOD_DEFAULT, 0, 0);
+			}
+			else
+			{
+				hr = text_layout_->SetLineSpacing(
+					DWRITE_LINE_SPACING_METHOD_UNIFORM,
+					style.line_spacing,
+					style.line_spacing * 0.8f
+				);
+			}
+		}
+
+		if (SUCCEEDED(hr))
+		{
+			hr = text_layout_->SetTextAlignment(DWRITE_TEXT_ALIGNMENT(style.alignment));
+		}
+
+		if (SUCCEEDED(hr))
+		{
+			hr = text_layout_->SetWordWrapping((style.wrap_width > 0) ? DWRITE_WORD_WRAPPING_WRAP : DWRITE_WORD_WRAPPING_NO_WRAP);
+		}
+
+		if (SUCCEEDED(hr))
+		{
+			if (style.underline)
+			{
+				hr = text_layout_->SetUnderline(true, { 0, text.length() });
+			}
+		}
+
+		if (SUCCEEDED(hr))
+		{
+			if (style.strikethrough)
+			{
+				text_layout_->SetStrikethrough(true, { 0, text.length() });
+			}
+		}
+
+		if (SUCCEEDED(hr))
+		{
+			if (style.wrap_width > 0)
+			{
+				hr = text_layout_->SetMaxWidth(style.wrap_width);
+			}
+			else
+			{
+				// Fix the layout width when the text does not wrap
+				DWRITE_TEXT_METRICS metrics;
+				hr = text_layout_->GetMetrics(&metrics);
+
+				if (SUCCEEDED(hr))
+				{
+					hr = text_layout_->SetMaxWidth(metrics.width);
+				}
+			}
+		}
+
+		ThrowIfFailed(hr);
 	}
 
 	UInt32 TextLayout::GetLineCount()

src/kiwano/renderer/win32/D2DDeviceResources.cpp

@@ -71,7 +71,6 @@ namespace kiwano
 		HRESULT CreateTextLayout(
 			_Out_ ComPtr<IDWriteTextLayout>& text_layout,
 			_In_ String const& text,
-			_In_ TextStyle const& text_style,
 			_In_ ComPtr<IDWriteTextFormat> const& text_format
 		) const override;
 
@@ -461,94 +460,20 @@ namespace kiwano
 	}
 
 	HRESULT D2DDeviceResources::CreateTextLayout(_Out_ ComPtr<IDWriteTextLayout>& text_layout, _In_ String const& text,
-		_In_ TextStyle const & text_style, _In_ ComPtr<IDWriteTextFormat> const& text_format) const
+		_In_ ComPtr<IDWriteTextFormat> const& text_format) const
 	{
 		if (!dwrite_factory_)
 			return E_UNEXPECTED;
 
-		HRESULT hr;
 		ComPtr<IDWriteTextLayout> output;
-		UInt32 length = static_cast<UInt32>(text.length());
+		HRESULT hr = dwrite_factory_->CreateTextLayout(
-
-		if (text_style.wrap_width > 0)
-		{
-			hr = dwrite_factory_->CreateTextLayout(
 			text.c_str(),
-				length,
+			static_cast<UINT32>(text.length()),
-				text_format.get(),
-				text_style.wrap_width,
-				0,
-				&output
-			);
-		}
-		else
-		{
-			hr = dwrite_factory_->CreateTextLayout(
-				text.c_str(),
-				length,
 			text_format.get(),
 			0,
 			0,
 			&output
 		);
-		}
-
-		if (SUCCEEDED(hr))
-		{
-			if (text_style.line_spacing == 0.f)
-			{
-				hr = output->SetLineSpacing(DWRITE_LINE_SPACING_METHOD_DEFAULT, 0, 0);
-			}
-			else
-			{
-				hr = output->SetLineSpacing(
-					DWRITE_LINE_SPACING_METHOD_UNIFORM,
-					text_style.line_spacing,
-					text_style.line_spacing * 0.8f
-				);
-			}
-		}
-
-		if (SUCCEEDED(hr))
-		{
-			hr = output->SetTextAlignment(DWRITE_TEXT_ALIGNMENT(text_style.alignment));
-		}
-
-		if (SUCCEEDED(hr))
-		{
-			hr = output->SetWordWrapping((text_style.wrap_width > 0) ? DWRITE_WORD_WRAPPING_WRAP : DWRITE_WORD_WRAPPING_NO_WRAP);
-		}
-
-		if (SUCCEEDED(hr))
-		{
-			if (text_style.underline)
-			{
-				hr = output->SetUnderline(true, { 0, length });
-			}
-		}
-
-		if (SUCCEEDED(hr))
-		{
-			if (text_style.strikethrough)
-			{
-				output->SetStrikethrough(true, { 0, length });
-			}
-		}
-
-		if (SUCCEEDED(hr))
-		{
-			// Fix the layout width when the text does not wrap
-			if (!(text_style.wrap_width > 0))
-			{
-				DWRITE_TEXT_METRICS metrics;
-				hr = output->GetMetrics(&metrics);
-				
-				if (SUCCEEDED(hr))
-				{
-					hr = output->SetMaxWidth(metrics.width);
-				}
-			}
-		}
 
 		if (SUCCEEDED(hr))
 		{

src/kiwano/renderer/win32/D2DDeviceResources.h

@@ -223,7 +223,6 @@ namespace kiwano
 		virtual HRESULT CreateTextLayout(
 			_Out_ ComPtr<IDWriteTextLayout>& text_layout,
 			_In_ String const& text,
-			_In_ TextStyle const& text_style,
 			_In_ ComPtr<IDWriteTextFormat> const& text_format
 		) const = 0;