Commit Graph

64750 Commits

Author SHA1 Message Date
Vadim Zeitlin
2cc44337c6 Use only wxFont ctor from wxFontInfo in the samples
Follow the documentation advice and prefer to use the ctor taking
wxFontInfo as it makes the code slightly shorter and more readable.
2018-09-17 15:29:42 +02:00
Vadim Zeitlin
b1dcdb864c Add simple unit tests for the new wxFont features
Check that calling SetFractionalPointSize() and SetNumericWeight() at
the very least results in the expected return values from
GetFractionalPointSize() and GetNumericWeight().
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
5a4d46bf7d Handle fractional point sizes in DirectWrite wxGraphicsFont
Also stop scaling the font size by DPI manually, we don't need to do it
if we use points instead of pixels. This, in turn, made it unnecessary
to pass ID2D1Factory parameter to wxD2DFontData ctor.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
d5020362ff Handle fractional point sizes in GDI+ wxGraphicsFont
Also switch to using UnitPoint when creating GDI+ fonts as it's not
clear at all why should we use UnitPixel here.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
f085981601 Add strikethrough support for fonts defined in XRC
Handle this attribute as well as "underlined" for completeness.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
ca164bb4ca Support fractional font sizes and numeric weights in XRC
Change the code to handle them, the XRC sample to test them, the schema
to accept them and the documentation to describe them.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
aedf89b098 Update wxNativeFontInfo::{To,From}String() after wxFont changes
Handle fractional point sizes and numeric weights in the custom string
formats in the ports using those.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
4ada99945f Extract ConvertFromLegacyWeightIfNecessary() function
Make it possible to reuse just this part of GetNumericWeightOf() in the
upcoming commit.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
c302a8d1e7 Use fractional point sizes in wxRichText code
When scaling, just use the floating point result directly instead of
rounding it.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
03f29d4b67 Don't round the larger or smaller font sizes unnecessarily
Use SetFractionalPointSize() instead of SetPointSize() to avoid losing
the fractional part of the font size, if any.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
85b8798558 Use fractional point size when scaling fonts in wxTipDialog
Don't unnecessarily round the result to int any longer.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
ac8b2e10a9 Use fractional point sizes in SetWindowVariant()
Don't round the scaled font size now that we can just directly use the
fractional value.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
cd24db056e Use SetFractionalPointSize() in wxFont::Scale()
This will result in more precise scaling.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
5d4ca0dbbe Add support for strike through attribute to markup spans
It can be handled in exactly the same way as underlining, so just do it
instead of leaving a "TODO" comment about it.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
ea00b0b603 Use SetFractionalPointSize() in wxMarkupParser code
Now that fractional sizes are supported, use them instead of rounding up
to integer size.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
e65381c8ee Show fractional point size and numeric weight in wxDumpFont()
Update to show the new wxFont fields.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
18d7801346 Fix wxMotif build after wxFont API changes
Run-time seems to be totally broken, but fonts are probably not the most
important problem in this port, so don't bother fixing it.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
90dd87ee65 Fix wxGTK1 build after wxFont API changes
Implement the new {Get,Set}{FractionalPointSize,NumericWeight} methods.

Also change wxLoadQueryFont() to use wxNativeFontInfo methods as a side
effect, to reduce code duplication and reuse the existing support for
numeric weights and fractional point sizes in wxNativeFontInfo.
2018-09-17 15:24:42 +02:00
Vadim Zeitlin
aff4b82663 Don't assert in wxNativeFontInfo::SetStyle() in wxGTK1
Add missing "break" statement.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
3e2fd136ff Disable tons of warnings given during wxGTK1 build
These warnings are not going to be fixed, so suppress them to at least
see the other ones more clearly.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
140b3c5e65 Disable wxGraphicsContext in wxGTK1 build, it doesn't compile
There is no chance of wxGraphicsContext ever being supported in this
legacy port, but at least disable it automatically instead of requiring
to specify --disable-graphics-ctx on the command line.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
468545943a Remove unnecessary line from the font sample
This was mistakenly left over in the commit adding private fonts support
(547e40b114).
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
720e1372e4 Allow leaving the point size unspecified for ports using XLFD
Rather than defaulting to the normal font size, just leave the font size
unspecified as it might result in better font size being chosen.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
22839b865d Fix bug with point sizes in wxX11 without Pango
XLFD strings specify size in tens of points, so add the missing factor
of 10.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
9627798496 More steps towards using wxFontInfo in all ports
Replace AccountForCompatValues() with InfoFromLegacyParams() which
directly constructs wxFontInfo from the old-style parameters, applying
all the compatibility hacks internally.

There are no real changes in this commit, just simplify the code further
and make wxFontInfo more central.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
7866c293e8 Add wxFontInfo::HasFaceName() and use it
No real changes, just simplify the code a little by adding this helper.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
03266b1091 Add wxFontRefData ctor from wxFontInfo to wxQt
This actually implements support for the fractional font sizes, as
previously the fractional part was lost when passing by the legacy
Create() taking only integer size.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
ce1e69cfa1 Implement wxNativeFontInfo::SetPixelSize() in wxQt
There doesn't seem to be any way to specify both font width and height
and pixels in Qt API, so just use QFont::setPixelSize() with the height.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
8715e56676 Remove unnecessary wxFontRefData::operator==() in wxQt
It wasn't used anywhere anyhow.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
d002acfec6 Add "Apply" button to the font sample
Live changes don't work correctly in all ports, notably wxQt, which
doesn't seem to generate the events correctly for wxSpinCtrl, so add a
button to apply the changes.

This could be seen as a better UI anyhow.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
2d8decd7f4 Improve mapping of font weights between Qt and wx
Support the entire [0, 99] range used by Qt instead of just some
selected values while still mapping all the predefined symbols to their
corresponding wx equivalents.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
f5cd9a7934 Update wxFont in wxQt after recent base class interface changes
Trivially implement the new wxFont::{Set,Get}{FractionalPointSize,
NumericWeight}() methods in terms of the corresponding wxNativeFontInfo
methods.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
9b661b918e Fix indentation of wxQt wxFontRefData declaration
No real changes.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
11c6009f68 Deprecate old wxFont(int, int, int, int) ctor in wxQt
It might be better to just remove it completely as legacy code is
unlikely to be built with wxQt, but for now at least deprecate it to
make this consistent with the other ports.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
de7ab2a45f Remove unnecessary wxFontRefData dtor in wxOSX too
Smart pointers will clean up the resources automatically, there is no
need to call Free() manually from the dtor.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
d9b62e0832 Initialize wxFontRefData::m_info directly in wxOSX code
Instead of using default ctor and Init() later, just use the appropriate
ctor directly.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
a860f5710b Change wxFontRefData ctor to take wxFontInfo in wxOSX too
Change wxOSX similarly to wxGTK and wxMSW in the two previous commits.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
34e01aa62d Change wxFontRefData ctor to take wxFontInfo in wxMSW
Apply the same change as was done for wxGTK in the previous commit to
wxMSW too, for the same reasons.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
7c9daf2e81 Change wxFontRefData ctor to take wxFontInfo in wxGTK
wxFontInfo is the preferred way to create wxFont objects, so rewrite the
internal classes to use it directly and implement the other ctors as
wrappers for the one taking wxFontInfo.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
c61fc16f96 Add wxFontInfo::Style() for consistency with Weight()
This will also be useful when changing the existing code to use
wxFontInfo().
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
11ab3b4786 Remove unnecessary wxFontRefData dtor
No real changes, just get rid of unnecessary code.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
a0d5b1e5da Get rid of wxDEFAULT_FONT_SIZE constant in wxGTK
Don't hardcode 12pt font size but use the size of the normal font
instead.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
f7a7fe6c4a Add wxNativeFontInfo::SetSizeOrDefault() and use it in all ports
Reuse the same code for determining the default font size to use if it
wasn't specified in all major ports.

In particular, make wxGTK behaviour compatible with the rest and use the
normal font size in this case instead of the hardcoded value of 12pt.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
24c83625f6 Remove Mac-specific wxFont ctors and fix strikethrough support
Only accept fractional point sizes and numeric weights via wxFont ctor
using wxFontInfo and avoid having specific ctor/Create() overloads for
the different combinations of font properties: this is not portable (as
these ctors don't exist in the other ports) and unsustainable due to the
very real potential of combinatorial explosion as more properties are
added.

As a side-effect, fix support for stricken-through fonts under Mac,
which was broken, by adding the missing wxFontInfo::IsStrikethrough()
call.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
cb8dc4d745 Allow changing the values of font properties in the sample
Use new wxFontInfo methods to allow testing setting fractional font
sizes and arbitrary numeric weight values in the sample.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
cfa37fefae Fix initial size of the font sample main window
Don't hard code main frame size in pixels, this is simple but wrong.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
a79bbf7348 Show font properties in controls in the font sample
This is done in preparation for allowing to change these control values,
although for now this is not implemented yet.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
09fdd090fa Exchange the font and test panels in the font sample
No real changes, but it seems to make more sense to show the font
information first and less important text sample below.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
6415bd553f Partially revert "CMake: Fix building and running samples"
This reverts part of 573e887a4c, see
https://github.com/wxWidgets/wxWidgets/pull/666 because it broke the use
of the generic dialogs in the sample under MSW (they were not used any
more, even if they were supposed to) and the explanation in the original
commit message doesn't seem correct: the WXUSINGDLL check is precisely
supposed to check if we're using a static build of wxWidgets (presumably
because of DLL export complications when not using it) and seems to work
as expected.

This allows to test generic dialogs in the sample again under MSW.
2018-09-17 15:24:41 +02:00
Vadim Zeitlin
ad9ef5f24d Remove unused variable from the font sample
No real changes.
2018-09-17 15:24:41 +02:00