| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| | |
Otherwise the update would always end up with the selection being in
the first block.
|
| | |
| |
| |
| |
| |
| | |
Order is 'soft to hard' W:, X: ... A:, Z: Duplicated font file
names are ignored. That should imitate the font loading behaviour
in the fbSrv.
|
| | |
| |
| |
| |
| | |
Previously, the input context would not get updated on every
selection update.
|
| | |
| |
| |
| |
| | |
RevBy: Trust me
The fix is almost identical to the one made for QLineEdit.
|
| |\ \ |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit ce02d0e9e0ad8d8ac47e4f3ee95bac5cb74ed184.
This turned out not to be enough for proper selection support
together with S60 FEP. Instead we will revert the behavior and add
new API.
|
| | | | | |
|
| |/ / /
| | |
| | |
| | | |
bounding rect, before.
|
| |\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| | |
The default DPI is stored in the S60 structure, so that can simply be
used here instead of re-calculating it each time.
Task-number: 247279
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
|
| | |
| |
| |
| | |
Task-number: 252489
|
| | |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| | |
| |
| |
| |
| |
| | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| | |
The OpenVG paint engine uses this value as the escapement of the glyph
and setting this to the vertical advance results in the text being laid
out in a declining staircase fashion. All other font engines seem to
set the vertical advance to zero so do the same here as well.
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/widgets/qmenu_symbian.cpp
|
| | |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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: nrc
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In 4.4 alphaMapForGlyph() would return valid images for any font size,
but this was changed in 4.5, forcing us to use the path fallback
instead. This lead to non-antialiased fonts when not using a
multisample-enabled GL format. This patch re-introduces the
alphaMapForGlyph() fallback in QFontEngine from 4.4 which uses the
raster paint engine to draw the glyph.
Task-number: 247083
Reviewed-by: Trond
|
| | | |
| | |
| | |
| | | |
Task-number: 244858
|
| | | |
| | |
| | |
| | |
| | |
| | | |
QTextCursor::operator=
Task-number: 247955
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
selections with different foreground but no background
The main concern is to avoid double painting. With anti-aliasing turned
on by default, we can not draw a piece of text on top of the same piece
of text without artefacts.
Task-number: 252310
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the feature has to handle text with and without background, and extra
selections with and without background, or even only with underline style.
Trouble is that you sometimes want to accumulate styles, for example spell
checking wiggly underline plus search result highlights or background markup
from the css stylesheet.
Task-number: 252310
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Asserts are replaced with warnings and the call is ignored.
Task-number: 252414, 252416, 252502
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since the introduction of the texture glyph cache we rendered these
fonts as 8-bit gray masks which looked bad and cut off a few pixels
for thin glyphs. Changed the preferred format of the font engine
to be Raster_RGBMask.
Task-number: 248141
Reviewed-by: Eskil B
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Apparently CoreText is too good for us and always gives us fractional
information. Which would be food for design metrics, but not good for
drawing to the screen. The upshot of it is that we do the ceiling of
every value we get. This is as stop gap solution for the moment. Things
in Creator should look better now.
Also added the ability to disable kerning.
Reviewed-by: Simon Hausmann
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Samuel
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The pieceTable member was only initialized by QTextDocumentPrivate
_after_ the call to createObject. This patch initializes it at
construction time.
Task-number: 246138
Reviewed-by: Simon Hausmann
|
| | | |
| | |
| | |
| | | |
bits(). The non-const bits() may detach and realign the data, so that the previous result of bytesPerLine() ist invalid. On S60, we actually had a 'skew' effect because of that.
|
| | | |
|
| |/ |
|
| |
|
