Nikolay Sivov : dwrite: Implement SetLineSpacing() for layout.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Feb 3 10:23:53 CST 2016
Module: wine
Branch: master
Commit: b2a0fbc158eb728f47ffb9ed0e48d2f52df0e80d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a0fbc158eb728f47ffb9ed0e48d2f52df0e80d
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Feb 2 23:14:40 2016 +0300
dwrite: Implement SetLineSpacing() for layout.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/layout.c | 44 +++++++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 13 deletions(-)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 8c611f9..1d09460 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -410,6 +410,21 @@ static inline HRESULT format_set_flowdirection(struct dwrite_textformat_data *fo
return S_OK;
}
+static inline HRESULT format_set_linespacing(struct dwrite_textformat_data *format,
+ DWRITE_LINE_SPACING_METHOD method, FLOAT spacing, FLOAT baseline, BOOL *changed)
+{
+ if (spacing < 0.0f || (UINT32)method > DWRITE_LINE_SPACING_METHOD_UNIFORM)
+ return E_INVALIDARG;
+
+ if (changed) *changed = format->spacingmethod != method ||
+ format->spacing != spacing || format->baseline != baseline;
+
+ format->spacingmethod = method;
+ format->spacing = spacing;
+ format->baseline = baseline;
+ return S_OK;
+}
+
static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback)
{
*fallback = format->fallback;
@@ -3725,12 +3740,23 @@ static HRESULT WINAPI dwritetextformat1_layout_SetTrimming(IDWriteTextFormat1 *i
return E_NOTIMPL;
}
-static HRESULT WINAPI dwritetextformat1_layout_SetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD spacing,
- FLOAT line_spacing, FLOAT baseline)
+static HRESULT WINAPI dwritetextformat1_layout_SetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD method,
+ FLOAT spacing, FLOAT baseline)
{
struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface);
- FIXME("(%p)->(%d %f %f): stub\n", This, spacing, line_spacing, baseline);
- return E_NOTIMPL;
+ BOOL changed;
+ HRESULT hr;
+
+ TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline);
+
+ hr = format_set_linespacing(&This->format, method, spacing, baseline, &changed);
+ if (FAILED(hr))
+ return hr;
+
+ if (changed)
+ This->recompute = RECOMPUTE_EVERYTHING;
+
+ return S_OK;
}
static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextformat1_layout_GetTextAlignment(IDWriteTextFormat1 *iface)
@@ -4726,16 +4752,8 @@ static HRESULT WINAPI dwritetextformat_SetLineSpacing(IDWriteTextFormat1 *iface,
FLOAT spacing, FLOAT baseline)
{
struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface);
-
TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline);
-
- if (spacing < 0.0f || (UINT32)method > DWRITE_LINE_SPACING_METHOD_UNIFORM)
- return E_INVALIDARG;
-
- This->format.spacingmethod = method;
- This->format.spacing = spacing;
- This->format.baseline = baseline;
- return S_OK;
+ return format_set_linespacing(&This->format, method, spacing, baseline, NULL);
}
static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextformat_GetTextAlignment(IDWriteTextFormat1 *iface)
More information about the wine-cvs
mailing list