Commit Graph

89 Commits

Author SHA1 Message Date
56218f7af4 Gfx: Improve line trimming with D2D when one line is visible 2013-08-10 15:26:50 +03:00
34abccc29b Gfx: Check for errors in TextFormatD2D::SetProperties 2013-08-10 15:25:36 +03:00
2e2ced7403 Gfx: Additional change to 6e04fd9 2013-08-10 14:14:02 +03:00
aa4c4a6dfc Gfx: Make AccurateText=1 more consistent with GDI+ for D2D when a newline character is the last character of the text 2013-08-10 13:58:54 +03:00
6e04fd983f Gfx: Make AccurateText=0 more consistent with GDI+ for D2D
The height is now based on a formula that should be exactly equal to that provided by GDI+. The padding should now be equal on the left and right sides now. There may be some discrepancies in overall width, but it should always be reasonably to close to GDI+.

In addition, this makes D2D behavior match GDI+ when a newline character is the last character of the text.
2013-08-10 13:54:53 +03:00
63f5eed742 Fix build bustage caused by 38ec6c3 2013-08-10 13:13:04 +03:00
616f986181 Gfx: Make D2D clip text that overflows the bounding box similarly to GDI+ 2013-08-10 12:13:59 +03:00
38ec6c3832 Gfx: Fix incorrect text X-position for StringAlign=Center with D2D 2013-08-10 12:08:15 +03:00
21f5ff1303 Gfx: Fix incorrect text height/width with D2D in some cases due to typo 2013-08-10 12:03:40 +03:00
5fcf4b785d Gfx: Fix that empty strings have a width and/or height with D2D 2013-08-04 21:46:59 +03:00
1e82a1659f D2D: Undo recent W/H calculations and revert back to 37fd105 calculations 2013-08-02 15:42:37 -06:00
bb53ddf71c D2D: Minor tweaks 2013-08-02 14:35:08 -06:00
9d525b1c1a D2D: More tweaks (partially reverts ccb2731)
Should account for extra padding when #CRLF# is used.
2013-08-02 14:32:07 -06:00
ccb273117a D2D: Tweaks 2013-08-02 09:54:14 -06:00
a1f15d9adc Minor tweaks 2013-08-02 14:46:42 +03:00
6b8d8a65d0 Gfx: Suppress int to float conversion warning 2013-07-31 13:15:26 +03:00
3c8c8a1f5e Gfx: Additional change to 37fd105 2013-07-31 13:12:15 +03:00
37fd105650 Gfx: Add Util::GetAdjustedDWriteTextLayoutMetrics to reduce code duplication 2013-07-31 13:09:48 +03:00
82b8920443 Gfx: Added comment 2013-07-31 12:55:32 +03:00
572f2da0d2 D2D: Tweaks 2013-07-30 17:01:16 -06:00
20cac72e9b Gfx: Implement GDI+ fallback 2013-07-30 22:57:46 +03:00
44300e2f41 Gfx: Change to use D2D 1.1 2013-07-30 22:38:51 +03:00
12dcf4628a D2D: Tweaks 2013-07-28 22:33:27 -06:00
2dda00a071 D2D: Tweaks to spacing 2013-07-28 12:01:35 -06:00
6aab840dfb D2D: Adjusted character spacing for AccurateText=0 2013-07-28 11:20:28 -06:00
52b5e2584a D2D: Removed centering of text within W/H (from 481442b) due to conflict with different alignments and a meter's defined W/H. 2013-07-28 01:10:19 -06:00
481442bc19 D2D: Tweaked formula that calculates the width/height of text using AccurateText=0 to better match GDI+. Also centers the text inside the adjusted width/height. 2013-07-28 00:00:22 -06:00
b27bf1ee63 Added "AccurateText" option [Rainmeter] section of a skin.
When AccurateText=0 (default) and UseD2D=0, inaccurate GDI+ measuring of text is used
When AccurateText=1 and UseD2D=0, Accurate measuring occurs similar to D2D
When AccurateText=0 and UseD2D=1, D2D adds padding to the text similar to GDI+
When AccurateText=1 and UseD2D=1, Accurate measuring occurs using D2D
2013-07-25 14:53:02 -06:00
96f27fffcb Reverted 32fc794 and cd35729 2013-07-20 10:09:37 -06:00
f76634055d Reverted 6e9bc98 due to bug in GDI+ and newline
http://rainmeter.net/forum/viewtopic.php?p=89915#p89915
2013-07-16 12:28:05 -06:00
6e9bc98d0b GDI+: Add trailing whitespace when measuring text (similar to 32fc794) 2013-07-13 10:16:35 -06:00
cd35729a17 Fixed typo in 32fc794 2013-06-30 00:15:36 -06:00
32fc7948ee CanvasD2D: Fix for trailing whitespace
http://rainmeter.net/forum/viewtopic.php?p=89139#p89139
2013-06-29 23:44:56 -06:00
096023ba6e Cosmetics 2013-06-14 16:58:53 +03:00
8a086ffdcb Make unit tests available in Release builds 2013-06-13 21:13:57 +03:00
c5e2a7a2cb Actually fix running debug projects that use unit testing 2013-06-13 20:52:15 +03:00
d63bb00f94 Revert "Fix running debug projects that use unit testing"
This reverts commit ced3dd2.
2013-06-13 20:23:42 +03:00
ced3dd20ca Fix running debug projects that use unit testing 2013-06-13 20:17:24 +03:00
a80c905be9 Add tests for StringUtil 2013-06-13 17:01:16 +03:00
516ef1a354 Add tests for MathParser 2013-06-13 17:01:00 +03:00
be3efa7531 Move MathParser to Common 2013-06-13 17:00:24 +03:00
3cebbc6b53 Add Common_Test project and PathUtil_Test.cpp
The tests use the new Native Unit Test framework in VS2012.
2013-06-12 23:13:04 +03:00
fed4b080b0 Cosmetics 2013-06-12 23:08:45 +03:00
cd4bf6d17a Create Common.vcxproj to use files under Common as a static library 2013-06-12 21:54:23 +03:00
d079d13da6 Move path related functions into PathUtil 2013-06-12 21:15:16 +03:00
bdb5605d24 Move RawString.h into Common 2013-05-31 17:34:36 +03:00
1934c5db72 Change NULL to nullptr 2013-05-31 17:28:39 +03:00
da9384cfad Remove "C" prefix in class names 2013-05-31 17:18:52 +03:00
0f6f6d48e5 Gfx: Minor fixes 2013-05-05 17:34:22 +03:00
e10cdd2a86 Gfx: Minor fix 2013-05-05 13:21:30 +03:00