Nikolay Sivov : dwrite: Implement SetReadingDirection() for layout.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jul 9 09:44:37 CDT 2015
Module: wine
Branch: master
Commit: 6d52bc59c0dbda7ce365979e291f4e0ffff6d2e7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d52bc59c0dbda7ce365979e291f4e0ffff6d2e7
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Jul 9 12:25:54 2015 +0300
dwrite: Implement SetReadingDirection() for layout.
---
dlls/dwrite/layout.c | 34 ++++++++++++-----
dlls/dwrite/tests/layout.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 119 insertions(+), 10 deletions(-)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index d979307..507ad01 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -352,6 +352,16 @@ static inline HRESULT format_set_paralignment(struct dwrite_textformat_data *for
return S_OK;
}
+static inline HRESULT format_set_readingdirection(struct dwrite_textformat_data *format,
+ DWRITE_READING_DIRECTION direction, BOOL *changed)
+{
+ if ((UINT32)direction > DWRITE_READING_DIRECTION_BOTTOM_TO_TOP)
+ return E_INVALIDARG;
+ if (changed) *changed = format->readingdir != direction;
+ format->readingdir = direction;
+ return S_OK;
+}
+
static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback)
{
*fallback = format->fallback;
@@ -2168,7 +2178,6 @@ static HRESULT WINAPI dwritetextlayout_SetWordWrapping(IDWriteTextLayout2 *iface
static HRESULT WINAPI dwritetextlayout_SetReadingDirection(IDWriteTextLayout2 *iface, DWRITE_READING_DIRECTION direction)
{
struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface);
- TRACE("(%p)->(%d)\n", This, direction);
return IDWriteTextFormat1_SetReadingDirection(&This->IDWriteTextFormat1_iface, direction);
}
@@ -3208,8 +3217,19 @@ static HRESULT WINAPI dwritetextformat1_layout_SetWordWrapping(IDWriteTextFormat
static HRESULT WINAPI dwritetextformat1_layout_SetReadingDirection(IDWriteTextFormat1 *iface, DWRITE_READING_DIRECTION direction)
{
struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface);
- FIXME("(%p)->(%d): stub\n", This, direction);
- return E_NOTIMPL;
+ BOOL changed;
+ HRESULT hr;
+
+ TRACE("(%p)->(%d)\n", This, direction);
+
+ hr = format_set_readingdirection(&This->format, direction, &changed);
+ if (FAILED(hr))
+ return hr;
+
+ if (changed)
+ This->recompute = RECOMPUTE_EVERYTHING;
+
+ return S_OK;
}
static HRESULT WINAPI dwritetextformat1_layout_SetFlowDirection(IDWriteTextFormat1 *iface, DWRITE_FLOW_DIRECTION direction)
@@ -4088,14 +4108,8 @@ static HRESULT WINAPI dwritetextformat_SetWordWrapping(IDWriteTextFormat1 *iface
static HRESULT WINAPI dwritetextformat_SetReadingDirection(IDWriteTextFormat1 *iface, DWRITE_READING_DIRECTION direction)
{
struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface);
-
TRACE("(%p)->(%d)\n", This, direction);
-
- if ((UINT32)direction > DWRITE_READING_DIRECTION_BOTTOM_TO_TOP)
- return E_INVALIDARG;
-
- This->format.readingdir = direction;
- return S_OK;
+ return format_set_readingdirection(&This->format, direction, NULL);
}
static HRESULT WINAPI dwritetextformat_SetFlowDirection(IDWriteTextFormat1 *iface, DWRITE_FLOW_DIRECTION direction)
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index 07ebaf3..70908d2 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -3120,6 +3120,100 @@ static void test_SetParagraphAlignment(void)
IDWriteFactory_Release(factory);
}
+static void test_SetReadingDirection(void)
+{
+ static const WCHAR strW[] = {'a',0};
+ DWRITE_CLUSTER_METRICS clusters[1];
+ DWRITE_TEXT_METRICS metrics;
+ IDWriteTextFormat *format;
+ IDWriteTextLayout *layout;
+ IDWriteFactory *factory;
+ DWRITE_READING_DIRECTION v;
+ DWRITE_LINE_METRICS lines[1];
+ UINT32 count;
+ HRESULT hr;
+
+ factory = create_factory();
+
+ hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ v = IDWriteTextFormat_GetReadingDirection(format);
+ ok(v == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, "got %d\n", v);
+
+ hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ v = IDWriteTextLayout_GetReadingDirection(layout);
+ ok(v == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, "got %d\n", v);
+
+ v = IDWriteTextFormat_GetReadingDirection(format);
+ ok(v == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, "got %d\n", v);
+
+ hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ count = 0;
+ hr = IDWriteTextLayout_GetLineMetrics(layout, lines, 1, &count);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(count == 1, "got %u\n", count);
+
+ count = 0;
+ hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 1, &count);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(count == 1, "got %u\n", count);
+
+ /* leading alignment, RTL */
+ hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+todo_wine
+ ok(metrics.left == metrics.layoutWidth - clusters[0].width, "got %.2f\n", metrics.left);
+ ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
+ ok(metrics.width == clusters[0].width, "got %.2f\n", metrics.width);
+ ok(metrics.height == lines[0].height, "got %.2f\n", metrics.height);
+ ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth);
+ ok(metrics.layoutHeight == 100.0, "got %.2f\n", metrics.layoutHeight);
+ ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount);
+
+ /* trailing alignment, RTL */
+ hr = IDWriteTextLayout_SetTextAlignment(layout, DWRITE_TEXT_ALIGNMENT_TRAILING);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+todo_wine
+ ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
+ ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
+ ok(metrics.width == clusters[0].width, "got %.2f\n", metrics.width);
+ ok(metrics.height == lines[0].height, "got %.2f\n", metrics.height);
+ ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth);
+ ok(metrics.layoutHeight == 100.0, "got %.2f\n", metrics.layoutHeight);
+ ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount);
+
+ /* centered alignment, RTL */
+ hr = IDWriteTextLayout_SetTextAlignment(layout, DWRITE_TEXT_ALIGNMENT_CENTER);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ ok(metrics.left == (metrics.layoutWidth - clusters[0].width) / 2.0, "got %.2f\n", metrics.left);
+ ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
+ ok(metrics.width == clusters[0].width, "got %.2f\n", metrics.width);
+ ok(metrics.height == lines[0].height, "got %.2f\n", metrics.height);
+ ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth);
+ ok(metrics.layoutHeight == 100.0, "got %.2f\n", metrics.layoutHeight);
+ ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount);
+
+ IDWriteTextLayout_Release(layout);
+
+ IDWriteTextFormat_Release(format);
+ IDWriteFactory_Release(factory);
+}
+
START_TEST(layout)
{
static const WCHAR ctrlstrW[] = {0x202a,0};
@@ -3162,6 +3256,7 @@ START_TEST(layout)
test_GetLineMetrics();
test_SetTextAlignment();
test_SetParagraphAlignment();
+ test_SetReadingDirection();
IDWriteFactory_Release(factory);
}
More information about the wine-cvs
mailing list