summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Implement QDirectFBPaintEngine::drawRoundedRectAnders Bakken2009-09-181-1/+1
| | | | | | We need to lock before falling back to QRasterPaintEngine Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Corrected some license headers.Kim Motoyoshi Kalland2009-09-183-11/+100
| | | | Reviewed-by: Samuel
* Switch glyph cache from Qt to SymbianLiang QI2009-09-183-3/+49
| | | | | | | Use Symbian glyph cache directly in QRasterPaintEngine, do not need cache them in Qt if on Symbian Platform. Reviewed-by: Alessandro Portale Reviewed-by: Jason Barron
* Allow forcing an empty window title.Denis Dzyubenko2009-09-181-1/+1
| | | | | | | | | | | | | When a user sets a window title on a window to an empty string we will not check if the value was an empty string before. This handles a special case on X11 and Windows when we set the window title to the application executable name by default if the user didn't provide the title, so if the user explicitely wants to remove the windowtitle completely and make it empty, he will be able to set it to an empty string. Reviewed-by: Olivier Goffart Reviewed-by: Prasanth Ullattil
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-182-2/+18
|\
| * Application crashes when a menu is inserted twice on a menubar (Cocoa).Prasanth Ullattil2009-09-182-2/+18
| | | | | | | | | | | | | | | | | | Cocoa does not allow NSMenu to have multiple supermenu's. If a menu is added again as submenu, Qt will now disable the menu item or the menu will not be added at all if it is added again to the menubar. Task-number: 258822 Reviewed-by: MortenS
* | Fixed broken scrolling of cached graphics items on X11.Samuel Rødal2009-09-181-41/+1
| | | | | | | | | | | | | | | | | | | | | | The scrolling was broken in other graphics systems than the native, since _q_scrollPixmap assumed that all QPixmaps were using the X11 backend. We can just use QPixmap::scroll instead, which should also make it faster with the raster paint engine than creating a temporary painter and doing a blit. Also, _q_scrollPixmap would do blending instead of blitting for non-opaque pixmaps. Reviewed-by: Olivier Goffart
* | Fixed passing a zero drawable to X11 api causing X errors.Denis Dzyubenko2009-09-181-4/+9
| | | | | | | | | | | | | | In the windowsurface we shouldn't create a backingstore pixmap if the window has invalid size. Reviewed-by: Samuel
* | Improved a qt_x11_wait_for_window_manager.Denis Dzyubenko2009-09-181-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to waiting until the window manager maps and reparents the window, also wait until we get initial expose event. The window manager will most probably send us several ConfigureNotify events, so wait until all of them are handled in addition to the Expose event (as one might rely on another). Also, we shouldn't wait for the ReparentNotify event if the window has X11BypassWindowManagerHint. Reviewed-by: Olivier Goffart
* | More robust implementation of qt_x11_wait_for_window_managerOlivier Goffart2009-09-181-4/+9
| | | | | | | | | | | | | | Make sure we recieve both ReparentNotify and MapNotify events. Also change the timeout to 2 seconds to cope with slow machines Reviewed-by: Denis
* | Fix compilation and remove trailing whitespace.Jason Barron2009-09-181-140/+140
| | | | | | | | | | | | Fix compilation on systems that support the extended bitmap format. Reviewed-by: Jani Hautakangas
* | Adding support for symbian graphics resources.Aleksandar Sasha Babic2009-09-187-3/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to convert from and to new Symbian type of graphics resource, namely SgImage. This only supported with the OpenVG graphics system. On other graphics systems this will return null QPixmap. Conflicts: src/corelib/global/qglobal.h src/gui/image/qpixmap.h src/gui/image/qpixmap_s60.cpp Reviewed-by: Jason Barron
* | Introduce native Symbian bitmap support to QPixmapJani Hautakangas2009-09-1818-256/+1122
| | | | | | | | | | | | | | | | | | This is done to reduce heap consumption and to give a possibility to share bitmaps across process. QPixmap maps to Symbian CFbsBitmap which is stored in Symbian font and bitmap server. Reviewed-by: Jason Barron
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-1823-231/+514
|\ \
| * | Don't loose precision by converting the sizes (qreals) to ints.Jan-Arve Sæther2009-09-181-16/+12
| | | | | | | | | | | | Reviewed-by: leo
| * | Call effectiveSizeHint(Qt::MinimumSize).width instead of minimumWidth()Jan-Arve Sæther2009-09-181-48/+40
| | | | | | | | | | | | | | | | | | Small refactoring, since the two code blocks were almost the same. Reviewed-by: leo
| * | QGraphicsAnchorLayout: Initial support for Size PolicyAnselmo Lacerda S. de Melo2009-09-182-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this commit we introduce initial support for Size Policy. The size policies supported now are: * QSizePolicy::Fixed * QSizePolicy::Minimum * QSizePolicy::Maximum * QSizePolicy::Preferred * QSizePolicy::Ignored Signed-off-by: Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>
| * | Use the proxy in QStyleOlivier Goffart2009-09-171-3/+3
| | | | | | | | | | | | Reviewed-by: trustme
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Tom Cooksey2009-09-1720-197/+451
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtwidgets/tst_qtwidgets.cpp
| | * | Fixed a bug in QToolTip when internal tool tips where reused.Trond Kjernaasen2009-09-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a tool tip is to be reused, it *has* to be visible otherwise it *may* get destroyed by the expiration timer before the timer is reset. The tst_qtooltip::setPalette() test triggered this obscure bug under Windows. Reviewed-by: Kim
| | * | Implement hasConflicts().Jan-Arve Sæther2009-09-176-95/+133
| | | |
| | * | Fix regression after code reviewShane Kearns2009-09-172-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The branch maintained its own set of native windows. This was commented to be a duplication of the native window list kept by QWidgetPrivate, and changed. Unfortunately, the set maintained on the branch contained only window owning controls, while the list kept by QWidgetPrivate contains all widgets that have a CCoeControl. Added a check for whether the control is window owning before using its DrawableWindow() to avoid getting a null pointer. Reviewed-by: Jason Barron
| | * | Fix unused variable compiler warningShane Kearns2009-09-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removed UID that wasn't used. Reviewed-by: Jason Barron
| | * | Enable compiling Symbian port with QT_NO_CURSORShane Kearns2009-09-175-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some missing #ifdef QT_NO_CURSOR, so the symbian port still compiles if this feature is configured out. Reviewed-by: Jason Barron
| | * | Fix glyph selection in symbol fonts that contain unicode cmap tableEskil Abrahamsen Blomfeldt2009-09-171-14/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some symbol fonts will contain a unicode cmap table in addition to the microsoft symbol cmap table that maps the symbol range (private range 0xf000 - 0xf100) into the correct glyphs. This is essentially a broken unicode table, and we should not prefer it if these conditions are true. In the strict cases where these conditions apply, we fall back to the symbol table instead. Task-number: QT-2354 Done-with: Lars Reviewed by: Lars
| | * | Merge branch 'orbit-fixes' into 4.6Jan-Arve Sæther2009-09-173-72/+148
| | |\ \
| | | * | QGraphicsAnchorLayout: Remove QGALPrivate::deleteAnchorData()Eduardo M. Fleury2009-09-172-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method, formerly called by the QGraphicsAnchor destructor, to remove the anchor associated to it, is no longer needed. That destructor now calls QGALPrivate::removeAnchor(), a method analagous to addAnchor(), that provides the high level feature of "anchor removal". Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| | | * | QGraphicsAnchorLayoutPrivate: Removing item from layout when there are no ↵Jesus Sanchez-Palencia2009-09-172-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more anchors Now the removeAnchor() method has returned and it is ready for being use in the API for ensure that items are removed from the layout when they have no more external anchors. Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | QGraphicsAnchorLayoutPrivate: Removing method removeAnchor()Jesus Sanchez-Palencia2009-09-172-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All method calls were replaced by calling removeAnchor_helper(), with internalVertex() calls Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | QGraphicsAnchorLayout: Removing methods names inconsistencies on private classJesus Sanchez-Palencia2009-09-173-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsAnchorLayoutPrivate now has addAnchor() replacing anchor() and addAnchor_helper() replacing addAnchor(). With this changes we are respecting the API behavior, where anchor() is a "getter" instead of a "setter". Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | * | QGraphicsAnchorLayout: Handle negative spacing in "setAnchorSpacing"Eduardo M. Fleury2009-09-171-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The simplex solver cannot handle negative-sized anchors. Those should be handled by the layout itself. This is done by inverting such anchors and making their size positive again. Ie. A --> B with size -10 becomes B --> A with size 10 Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| | | * | QGraphicsAnchorLayout: Fix anchor creation heuristicsEduardo M. Fleury2009-09-171-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the case where creating an anchor between the layout Left edge and an item Right edge (or vice-versa) would have different behaviors depending on the argument order. Now both calls below have the same meaning: addAnchor(layout, Qt::AnchorLeft, widget, Qt::AnchorRight) addAnchor(widget, Qt::AnchorRight, layout, Qt::AnchorLeft) Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| | * | | Control-drag header selection behaved wierdly.Gabriel de Dietrich2009-09-173-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QItemSelectionModel::Current was not set in QTableViewPrivate::selectColumn(). However, Control-drag selection in QTableView behaved differently than other software such as OpenOffice's spreadsheet. Now the behaviour when Control-dragging is that the selection will be set to the opposite of the selection state of the first cell. If that cell is selected, we will deselected the cells while dragging, and conversely, if it isn't selected, the cells will be selected. Reviewed-by: Olivier Task-number: QT-1435 Task-number: 191545
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-172-1/+36
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-171-1/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Sorvig2009-09-1710-11/+46
| | | |\ \ \
| | | * | | | Improve font handling on Mac/Cocoa.Morten Sorvig2009-09-161-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mac/Cocoa font database currently relies on two APIs, ATSUI (old) and CoreText (new). These are interchangable and work on the same font database. Some differences do exist, in particular ATSFontFamilyGetName seems to return the same as ATSFontGetName for some fonts - the font name, not the family name. In any case, the old ATS code path is initializing QFontDatabase::familes() with the font name. This causes a naming mismatch with code that uses CoreText and gets the proper family name, in this case in initializeDb(). The fix is to make sure the correct family name is used by using the CoreText API to access it. RevBy: TrustMe
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-1712-18/+55
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-1670-295/+1377
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-1525-232/+501
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-1322-80/+176
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-101098-4529/+4512
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-0910-61/+143
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-0810-31/+70
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-0733-569/+822
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove redundant includeSarah Smith2009-09-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race. Reviewed-by: Trust Me
| | * | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-041-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix compile breakageSarah Smith2009-09-042-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing inline from private header causes undef symbol error. Also added dep for a private header missing. Reviewed-by: Lincoln Ramsay
| * | | | | | | | | | | | | | Merge branch '4.5' into 4.6Tom Cooksey2009-09-173-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qpainter/tst_qpainter.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| | * | | | | | | | | | | | | Fix crash or painting error when drawing dashed lines with penWidth > 1Eskil Abrahamsen Blomfeldt2009-09-172-2/+4
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the width is multiplied into the dash, it needs to be divided out, otherwise you can get a dashOffset which is greater than the pattern at the index, and the dash can become negative. This will in turn lead to passing a negative width to the rasterizer, which at some point will get cast to an unsigned int and overflow. Depending on the position of the line and size of the buffer, this will either crash or produce garbled output. Task-number: QT-4444 Reviewed-by: Samuel