chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Revert changes to TextFormatD2D_Test.cpp in 729b145

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-12-23 16:20:45 +00:00
parent 729b145653
commit 106e1664c3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Common/Gfx/TextFormatD2D_Test.cpp
View File

@ -48,12 +48,12 @@ public:
DWRITE_TEXT_METRICS metrics; DWRITE_TEXT_METRICS metrics;
metrics = textFormat->GetMetrics(L"test", 4, true); metrics = textFormat->GetMetrics(L"test", 4, true);
Assert::AreEqual((int)metrics.width, 26); Assert::AreEqual(26, (int)metrics.width);
Assert::AreEqual((int)metrics.height, 16); Assert::AreEqual(16, (int)metrics.height);
metrics = textFormat->GetMetrics(L"test", 4, false); metrics = textFormat->GetMetrics(L"test", 4, false);
Assert::AreEqual((int)metrics.width, 21); Assert::AreEqual(21, (int)metrics.width);
Assert::AreEqual((int)metrics.height, 14); Assert::AreEqual(14, (int)metrics.height);
} }
TEST_METHOD(TestTrailingNewlineGdipCompatibility) TEST_METHOD(TestTrailingNewlineGdipCompatibility)
@ -64,19 +64,19 @@ public:
DWRITE_TEXT_METRICS metrics; DWRITE_TEXT_METRICS metrics;
metrics = textFormat->GetMetrics(L"test\n", 5, false); metrics = textFormat->GetMetrics(L"test\n", 5, false);
Assert::AreEqual((int)metrics.height, 15); Assert::AreEqual(15, (int)metrics.height);
metrics = textFormat->GetMetrics(L"test\r\n", 6, false); metrics = textFormat->GetMetrics(L"test\r\n", 6, false);
Assert::AreEqual((int)metrics.height, 15); Assert::AreEqual(15, (int)metrics.height);
metrics = textFormat->GetMetrics(L"test\n ", 6, false); metrics = textFormat->GetMetrics(L"test\n ", 6, false);
Assert::AreEqual((int)metrics.height, 30); Assert::AreEqual(30, (int)metrics.height);
metrics = textFormat->GetMetrics(L"test\r\n ", 7, false); metrics = textFormat->GetMetrics(L"test\r\n ", 7, false);
Assert::AreEqual((int)metrics.height, 30); Assert::AreEqual(30, (int)metrics.height);
metrics = textFormat->GetMetrics(L"test\n\n", 6, false); metrics = textFormat->GetMetrics(L"test\n\n", 6, false);
Assert::AreEqual((int)metrics.height, 30); Assert::AreEqual(30, (int)metrics.height);
metrics = textFormat->GetMetrics(L"test\r\n\r\n", 8, false); metrics = textFormat->GetMetrics(L"test\r\n\r\n", 8, false);
Assert::AreEqual((int)metrics.height, 30); Assert::AreEqual(30, (int)metrics.height);
} }
}; };