summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2989-203/+201
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * Compile.Norwegian Rock Cat2009-06-231-1/+1
| | | | | | | | Mismatch in preprocessor my previous commit.
| * Recognize | as separator characterThorbjørn Lindeijer2009-06-231-0/+1
| | | | | | | | Reviewed-by: mae
| * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-232-1/+3
| | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
| * Improve text drawing quality with CarbonSimon Hausmann2009-06-231-5/+0
| | | | | | | | | | | | | | Re-enable fractional coordinates for text output, to produce the same output as regular Carbon/ATSUI applications. Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1689-178/+178
| | | | | | | | Reviewed-by: Trust Me
| * Fixed a problem with disappearing borders in a QTextFrame.Trond Kjernåsen2009-06-111-18/+18
| | | | | | | | | | | | | | | | | | The border was always drawn before the background, and if there were both a border and background brush set, the background ended up being drawn ontop of the border. Task-number: 255868 Reviewed-by: Samuel
* | Make Qt exception safer.Robert Griebl2009-06-1016-165/+224
| | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | pointSize = 7 seems to be a good desfault for S60Alessandro Portale2009-06-081-1/+0
| | | | | | | | | | There were no objections from the field with ing one Year of Tech Previews.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-084-22/+18
|\ \ | |/ | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| * Fixed text drawing on Windows in 16 bit mode.Trond Kjernaasen2009-06-052-13/+16
| | | | | | | | | | | | | | | | | | | | | | 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
| * BT: Remove duplicate code and fix font parsing.Norwegian Rock Cat2009-06-022-9/+2
| | | | | | | | | | | | | | | | | | | | | | 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
* | Made Selection updates relative to the block.axis2009-06-051-2/+3
| | | | | | | | | | Otherwise the update would always end up with the selection being in the first block.
* | Loading fonts from other /resource/fonts folders than the one on Z:Alessandro Portale2009-06-041-4/+40
| | | | | | | | | | | | 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.
* | Fixed an update bug in QTextControl.axis2009-06-031-0/+3
| | | | | | | | | | Previously, the input context would not get updated on every selection update.
* | Gave QTextControl support for ImAnchorPosition and Selection.axis2009-06-031-3/+23
| | | | | | | | | | RevBy: Trust me The fix is almost identical to the one made for QLineEdit.
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicAlessandro Portale2009-06-035-5/+125
|\ \
| * \ Merge branch 'imSelections'axis2009-06-035-5/+125
| |\ \
| | * | Revert "Changed the behavior of ImCursorPosition slightly."axis2009-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Fixed incorrect headers.axis2009-06-034-4/+124
| | | |
* | | | Fixed QFontEngineS60::boundingBox. It was actually returning the tightAlessandro Portale2009-06-031-20/+7
|/ / / | | | | | | | | | bounding rect, before.
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-022-9/+9
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | 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.
| * BT: Fixed GL textdrawing in the Boxes demo.Trond Kjernaasen2009-05-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-6/+6
| | | | | | | | Reviewed-by: Trust Me
* | Optimize font DPI calculation by using cached value.Jason Barron2009-05-281-4/+2
| | | | | | | | | | | | | | 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-254-26/+43
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/io/qfile.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp
| * qdoc: Added some missing qdoc comments.Martin Smith2009-05-252-11/+14
| | | | | | | | Task-number: 252489
| * Fixed potential bug caused by change b89efc8e7f32.Samuel Rødal2009-05-221-1/+1
| | | | | | | | | | | | | | If ensureSpace causes the layoutData to reallocate then the initialGlyphs pointers will no longer be valid. Reviewed-by: Simon Hausmann
| * Fixed text shaping bugs with ligatures and multiple font engines.Samuel Rødal2009-05-221-14/+26
| | | | | | | | | | | | | | | | 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
| * Fixed an issue with text drawing to QImages on Mac/Cocoa.Trond Kjernåsen2009-05-221-1/+3
| | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-203-9/+14
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * Fix some typos in the documentation.Frederik Schwarzer2009-05-182-2/+2
| | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
| * QCss: font-family handle fallback font specsOlivier Goffart2009-05-181-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-183-5/+10
|\ \ | |/ | | | | | | | | | | | | | | 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.
| * Fixed an issue with text drawing under Windows.Trond Kjernaasen2009-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | 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
| * Made QFontEngineFT compile on 64-bit platforms with legacy headers.Samuel Rødal2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | 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 docs for QTextTable::splitCell()Morten Engvoldsen2009-05-111-1/+6
| | | | | | | | | | | | | | | | Clarifying details about QTextTable::splitCell() regarding splitting and merging over several rows and columns Task-number:193732 Rev-by: Geir Vattekar
* | Set the vertical advance of glyph metrics to zero.Jason Barron2009-05-181-1/+1
| | | | | | | | | | | | | | 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.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-1118-70/+208
|\ \ | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_symbian.cpp
| * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-118-29/+90
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
| | * Prevented asynchronous access to non-thread safe libfontconfig API.Samuel Rødal2009-05-081-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | We need to protect calls to FcCharSetHasChar with the font database mutex. Task-number: 241361 Reviewed-by: Simon Hausmann
| | * Fix reentrency of the QCSS engine.Olivier Goffart2009-05-081-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-1/+1
| | | | | | | | | | | | Reviewed-by: nrc
| | * Re-enabled antialiasing for large font sizes in OpenGL paint engine.Samuel Rødal2009-05-063-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Doc: Added links to Text Object Example in QTextDocument and QTextObjectGeir Vattekar2009-05-062-2/+2
| | | | | | | | | | | | Task-number: 244858
| | * Doc: Said that QTextCursor is an implicitly shared class inGeir Vattekar2009-05-061-1/+4
| | | | | | | | | | | | | | | | | | QTextCursor::operator= Task-number: 247955
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-063-14/+64
| |\ \ | | |/
| | * Extend change 759338df758ad16cdfd9521b270f7e379bbfa57c to cover extramae2009-05-051-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * QTextEdit::ExtraSelection failure with style sheetsmae2009-05-052-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fix a crash in case of setting invalid point sizeJarek Kobus2009-04-291-2/+8
| | | | | | | | | | | | | | | | | | | | | Asserts are replaced with warnings and the call is ignored. Task-number: 252414, 252416, 252502 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
generated by cgit v0.12 at 2025-02-27 06:05:57 (GMT)