| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
We used tab-ref to place multiple tabs compressed into one tag just like
text:s does, but thats not what the spec says. We now don't sum up
tabs anymore but just simply write out one "<text:tab/>" tag per tab.
Task: 249110
|
|
|
|
| |
private class member.
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There were several problems with antialiased text in 16 bit mode
under Windows. No gamma correction was done, yet we prepared the
cached glyphs for gamma correction. The mask format we rendered
the glyphs into was also set to the desktop depth, which implied
that information was lost and the text looked rather odd.
Reviewed-by: Samuel
BT: yes
|
| |
| |
| |
| |
| |
| |
| | |
This is covered by the autotest
tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange()
Reviewed-by: con
|
| |
| |
| |
| |
| |
| |
| |
| | |
Some checks where in the wrong locations, and some endifs where
hard to read.
Merge-request: 611
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The check for cleartype in qt_win_read_cleartype_settings() was not
correct for Windows Mobile
For anti-aliased text rendering we also have to use another
pixel format for the native image.
Task-number: 249642
Reviewed-by: mauricek
|
| |
| |
| |
| |
| |
| |
| | |
seem fixable easily)
Merge-request: 594
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QFont has a feature that you can pass a comma-separated list and it will
walk through the list and match the font that it hits first. There's a
nice static function that X11 and Windows uses, but the Mac was using an
older copied version of it. This old version didn't handle quoting which
is what happens in the style sheet. So, using the same code makes
everything work well. As a bonus, Creator looks correct again.
Reviewed-by: Simon Hausmann
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Brad Hards (2):
Remove duplicate qpdf_p.h include.
Fix build when compiling Qt using -no-opengl configuration.
Request-url: http://gitorious.org/qt/qt/merge_requests/548
Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
|
| | | |
|
|/ / |
|
| |
| |
| |
| |
| | |
used character operations whenever possible
better usage of QLatin1String
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reworked the 85f98acaa3a38079071bea711e43c9a86edec1f6 fix, since
it broke glyph positioning in the GL engine under Windows.
Instead of changing the glyph cache margin, which impacts where
the glyph is positioned, we just make the image the glyph is drawn
into 4 pixels bigger in width/heigth.
The margin in QImageTextureGlyphCache needs to be reworked..
Task-number: 254450
Reviewed-by: Eskil
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Task-number: 252489
|
| |
| |
| |
| | |
This is a small fix to 4af30f47c37fd0e6826aca2984dd0f567dc7e465
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Wherever I found that we were using a string instead of a single char
I fixed the code.
Reviewed-by: olivier
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
If ensureSpace causes the layoutData to reallocate then the
initialGlyphs pointers will no longer be valid.
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
If Harfbuzz shaping adds or merges glyphs we need to move the remaining
glyphs in the glyph layout to compensate.
Task-number: 253783
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We currently don't support subpixel hinting when drawing text to a
QImage on Mac. The alpha map that is returned by the font engine
is a plain 8 bit gray mask, which means we have to switch off subpixel
hinting when we draw the glyph for caching.
Task-number: 249178
Reviewed-by: Samuel
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
if one specify more than one parameter in font-family,
e.g., font-family: Verdana, Arial
Qt should fallback on the second font if the first cannot be found.
QFont::setFamily handle the case when the family name contains a comas,
so we do not need to handle that specially in the css parser code.
Task-number: 252311
Reviewed-by: Thomas Zander
|
| |
| |
| |
| |
| | |
the Q_GUI_EXPORT macro have been removed, but we still need to export
the classes for the test
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some text drawn with OpenType fonts where cut off by a pixel or two
under certain circumstances. This adds an additional 2 pixel pad margin
to the glyph cache entries. The padding behaves slightly different
when ClearType is enabled/disabled, hence the general 2 pixel padding.
Task-number: 246196
Reviewed-by: Samuel
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In older Freetype headers FT_LCD_FILTER_DEFAULT is apparently defined to
be ((const FT_Byte*)(void*)(ft_ptrdiff_t)1), which leads to a compile
error due to precision loss when casting to int.
Task-number: 253186
Reviewed-by: Trond
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Clarifying details about QTextTable::splitCell() regarding
splitting and merging over several rows and columns
Task-number:193732
Rev-by: Geir Vattekar
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
We need to protect calls to FcCharSetHasChar with the font database
mutex.
Task-number: 241361
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTextDocument which is suposed to be reentrant may use the CSS Parser in
different threads.
The way the indexOfId was computed is not thread safe.
Insert the pre-computed value instead
Reviewed-by: Thierry
|
| |
| |
| |
| | |
Reviewed-by: ogoffart
|
| |
| |
| |
| | |
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With this patch, commands no longer merge across block bounderies.
In order to have merging still work for the normal insertion and deletion
case, the unnecessary beginEditBlock()/endEditBlock() calls where
cleaned up.
Reviewed-by: Simon Hausmann
|