summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-10-231-28/+3
|\
| * QWindowsMobileStyle::drawPrimitive(PE_Frame) background color fixedJoerg Bornemann2009-10-221-4/+2
| | | | | | | | | | | | | | | | The background color of PE_Frame was palette().light() and has been changed to use palette().background() now. This fixes the autotest tst_QStyleSheetStyle::task188195_baseBackground for Windows mobile. Reviewed-by: thartman
| * move default QAbstractButton font setup on Win mobile to QApplicationJoerg Bornemann2009-10-221-24/+1
| | | | | | | | | | | | | | | | The original approach of modifying the font for QAbstractButtons in QWindowsMobileStyle::polish broke the autotest tst_qstylesheetstyle::fontPropagation. Reviewed-by: thartman
* | Line spacing fixesJoerg Bornemann2009-10-235-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextEdit (via QTextLayout) and QPlainTextEdit in Qt used to ignore any font leading but added one extra pixel in QFontMetrics. With many freetype fonts, this resulted in a "spacy" text layout. The necessary fixes on X11 and Windows were to take (positive) leading into account, to make the font database convert point sizes to pixel sizes without rounding to plain integer values, and to subtract the extra pixel from QFontMetrics from the font engines' descent value. The change also fixes several places in styles and widgets, where QFontMetrics::lineSpacing() was wrongly used instead of QFontMetrics::height(). Ideally we should also handle negative leading, which would require additional and bigger code changes in QTextLayout and QPlainTextEdit. In addition, all other editors we have tested seem to ignore leading on X11. If we choose to believe the values provided by freetype, our text layout would be one pixel smaller than everybody else's. On the Mac, this change does nothing. There our layout is still too spacy, and for smaller fonts quite ugly compared to native Mac applications. Done with mae. Reviewed-by: mae
* | Cleaned up the API of the Symbian event hooks.axis2009-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two major points were: - Replacing "s60" with "symbian" in all event handling functions, since there is nothing S60-specific about them. - Replace the Symbian event types with the encapsulating QSymbianEvent container. This allows us to cope with more types of events in the future without having to add new virtual functions. AutoTest: QWidget passed Task: QT-1156 RevBy: Jason Barron RevBy: Shane Kearns RevBy: Sami Merila
* | fix editable comboboxes in the Windows mobile styleJoerg Bornemann2009-10-211-31/+73
| | | | | | | | | | | | | | | | In editable QComboBoxes we used cutting-edge technology to display the text. But that's not always wanted. We actually want to see all pixels of a string like "why oh why". The lower edge was cut off. Reviewed-by: thartman
* | S60Style's tab widget is too small for touch useSami Merilä2009-10-214-4/+36
| | | | | | | | | | | | | | | | | | | | TabWidget for S60Style is too small for touch use, it is rather hard to accurately touch the tabpane to switch the active tab. To fix this, we ask the native tabpane height from AVKON and set the QTabWiget's pane height to native height (or bigger). Task-number: QTBUG-4243 Reviewed-by: Alessandro Portale
* | Use premultiplied alpha pixel format in SymbianShane Kearns2009-10-201-4/+3
| | | | | | | | | | | | | | | | | | Gives better performance in the raster paint engine. For Symbian 9.3 onwards, this can also be used as the native pixmap format. For 9.2, conversion is required. Reviewed-by: Sami Merila Reviewed-by: Jani Hautakangas
* | QT-693 QS60Style does not regard selection beahviors with itemviewsSami Merilä2009-10-201-2/+22
| | | | | | | | | | | | | | | | | | | | | | QS60Style disregards all selection behaviors for itemviews. This leads to error when showing a highlighted selection rect; rect is only shown for cell having focus. Fixed by setting the highlight to all 'selected' cells. Task-number: QT-693 Reviewed-by: Alessandro Portale
* | qwindowsmobilestyle.cpp: endif comment fixedJoerg Bornemann2009-10-191-1/+1
| |
* | Fixed getting an icon for a file on the filesystem with gnome.Denis Dzyubenko2009-10-091-3/+6
| | | | | | | | | | | | | | | | | | | | According to the documentation gnome_icon_lookup_sync() can return an absolute file path for the icon, so we check if the returned string starts like a path, then we load the icon from the file. This also fixes compilation warnings. Reviewed-by: Olivier Goffart
* | Color role with higher contrast for focusrectAlessandro Portale2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Low-risk, high value change. Beta worthy! As much as QPalette::Highlight sounds like a suitable color role for drawing a focus rect... It simply did not work well with a lot of S60 themes (e.g. the default N95 theme). QPalette::Text is a better candidate, since the S60 themes promise a good contrast of text on background graphics. Reviewed-By: Sami Merilä
* | QS60Style: Re-enable color-from-skin-part extractionAlessandro Portale2009-10-081-5/+4
| | | | | | | | | | | | | | | | | | | | | | After introducing native pixmap support, we had some crashes on certain setups (e.g. 3.2 Emulator) when accessing data that came from native pixmaps (FBServ). However, after fix 064674426ef0c446561b0c338441bb7d5ca091bf this is not reproducable, anymore. Therefore let's re-enable color extraction and enjoy better color palettes. Reviewed-By: Sami Merilä
* | Merge branch '4.5' into 4.6Thiago Macieira2009-10-081-1/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qheaderview.cpp
| * Fix ASSERT caused by Plastique style when setting an application font with a ↵Bradley T. Hughes2009-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | pixel size Use QFontInfo to query the pointSize() instead of asking the font directly, fixing this assert: ASSERT failure in QFont::setPointSize: "point size must be greater than 0", file text/qfont.cpp, line 855 Task-number: QTBUG-3555 Reviewed-by: Simon Hausmann
* | Let the platform plugin decide on the click policy on itemviewOlivier Goffart2009-10-081-1/+1
| | | | | | | | Reviewed-by: Jens Bache-Wiig
* | Integrate the GuiPlatformPlugin interfaceOlivier Goffart2009-10-072-51/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an internal interface for plugins that can be provided by the platform to give platform-specific features by platforms built on top of Qt. We can easlily integrate Qt on Windows, Mac, Gnome, ... without any plugin because we can link to their respective library (dynamically if we don't want to depend on it). On Gnome, we can dynamically resolve Gtk+ symbols. This is however not possible for KDE or other platform built on top of Qt: we can't link against their library because they depend on us and we can't dynamically resolve the symbols because they are mangled (C++) So this plugin provides hooks inside Qt to be able to do things like native File or Color dialog, native icons, accurate reading of the config file, and so on. This is currently private API. Task-number: QT-406 Reviewed-by: Jens Bache-Wiig Reviewed-by: Oswald Buddenhagen
* | Better compile fix.Alexis Menard2009-10-061-1/+1
| | | | | | | | Reviewed-by:Thiago
* | Build fix.Alexis Menard2009-10-061-1/+1
| |
* | Add GNOME implementation for native filesystem iconsJens Bache-Wiig2009-10-062-0/+57
| | | | | | | | | | | | | | | | | | | | | | This adds some code to support native filesystem icons on GNOME. It works by resolving gnome libs and gnome-vfs dynamically, hence we are explicitly running it on GNOME only and not KDE. Even if it would work there as well. We are planning on adding this functionality to the platform plugin as well. Task-number: QTBUG-2195 Reviewed-by: joao
* | Renamed the values in the Qt::TileRule enum.Trond Kjernåsen2009-10-021-1/+1
| | | | | | | | | | | | | | Stretch, Repeat and Round are too generic. Renamed to StretchTile, RepeatTile and RoundTile. Reviewed-by: Gunnar
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-014-23/+22
|\ \
| * | Make itemviews use gradient selection on Vista by defaultJens Bache-Wiig2009-09-092-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We postponed this in 4.3 when the vista style was introduced since a lot of microsoft apps still used the legacy style and microsoft did not enable it by default. It has been reported as bugs a few times and it seems increasingly odd that we are not using the more modern look and feel when we can. Instead of only enabling it for QTreeView, we now only disable it for QTableView as the look still cannot be used to span vertical cells. Task-number: QTBUG-3746 Reviewed-by: prasanth
| * | Fixed warning in public header:Olivier Goffart2009-09-301-0/+3
| | | | | | | | | | | | | | | | | | | | | qcommonstyle.h:87: warning: virtual void QCommonStyle::polish(QPalette&) was hidden qs60style.h:77: warning: by QS60Style::polish Reviewed-by: Jeremy
| * | Symbian specific fixes to QComboBoxJani Hautakangas2009-09-301-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes QComboBox edit field geometry in s60style Fixes softkey crash when setting a custom itemview to QComboBox Fixes Symbian keyboard input interval in tst_QComboBox::virtualAutocompletion() Reviewed-by: Sami Merila
* | | Worked around S60 3.1 bug in CCoeControl::PositionRelativeToScreenMiikka Heikkinen2009-10-011-4/+14
|/ / | | | | | | | | | | | | | | | | | | | | CCoeControl::PositionRelativeToScreen sometimes freezes the device in S60 3.1 based devices. Exact cause is unknown, but it might be OOM situation given that some cases where this is an issue, changing to a simpler theme makes the freeze go away. Task-number: QTBUG-4565 Reviewed-by: Sami Merila Reviewed-by: Espen Riskedal
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-241-11/+0
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/formextractor/formextractor.pro mkspecs/features/qt.prf src/gui/painting/qpaintengineex.cpp
| * Fix broken drop-down arrows on Windows 7Jens Bache-Wiig2009-09-221-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This issue affects both tool buttons and buttosn with menus. The problem is that the Windows metric we were using to calculate the size changed on Windows 7. It seems not to be the correct metric so it seems more reliable to use the dpi-scaled constant 12 as we were doing in common style already. This should make appearance consistent between the windows versions. Task-number: QTBUG-4241 Reviewed-by: denis
| * Update license headers again.Jason McDonald2009-09-0850-200/+200
| | | | | | | | Reviewed-by: Trust Me
| * Fix pixel snow on the combo box popup on Snow Leopard.Morten Sorvig2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | On 10.5 and below the pixmap data bytes happened to be initialized by malloc, on 10.6 this is no longer the case. Revby: Gunnar Sletta <gunnar@trolltech.com> Similar to 28f94e1ef94f.
* | Fix the area above the menubar to have the right backgroundAndy Shaw2009-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | When a gradient was set on the whole window then there was a line above the menubar that repeated the gradient for each menu item. Since there is a workaround in place already for the background of the menu to get painted correctly, we just extend the rect this covers to ensure the extra line of pixels is included. Reviewed-by: Jens Bache-Wiig
* | Ensure that the gradient is not given an invalid stop pointAndy Shaw2009-09-241-7/+7
| | | | | | | | | | | | | | | | | | When the size is 4 or less then it had would end up specifying a stop point greater than 1 when setting up the gradient. By rights a size less than 4 should not happen but this ensures it does not cause a warning. Reviewed-by: Jens Bache-Wiig
* | Added QSlider to tst_QStyleSheetStyle::complexWidgetFocus.Gabriel de Dietrich2009-09-232-7/+15
| | | | | | | | | | | | | | When using style sheets, QSlider::handle couldn't be customized if QSlider::groove wasn't. QComboBox::down-arrow:focus wasn't properly drawn. Reviewed-by: Olivier
* | When using style sheets, the focus flag was not propagated to the children ofGabriel de Dietrich2009-09-231-1/+1
| | | | | | | | | | | | complex widgets. Reviewed-by: Olivier
* | Fall back to pixmaps in xp style when toplevel is translucentGunnar Sletta2009-09-231-1/+10
| | | | | | | | | | | | | | | | The "fast path" will write bad premlutiplied pixels into the backbuffer so the blending will be broken, plus that the window does not get mouse events for alpha=0 pixels. Reviewed-by: Marius Storm-Olsen
* | Make gtkstyle work on non-developer machines againHarald Fernengel2009-09-231-1/+2
| | | | | | | | | | | | | | | | While refactoring gtkstyle in 4.6, the "0" .so suffix was dropped. This patch restores the 4.5 behavior to look for *.so.0 since the *.so is only available if you install the gtk developer packages. Reviewed-by: jbache
* | Fixed incorrect warning when unable to detect GTK themeJens Bache-Wiig2009-09-221-20/+25
| | | | | | | | | | | | | | | | | | If for some reason the theme name was not detectable, Qt would incorrectly print "QGtkStyle cannot be used together with the GTK_QT engine." I now added a separate "QGtkSTyle was unable to detect the current GTK+ theme." warning instead. Reviewed-by: Trust Me
* | Fix autotest failure on combo box with Gtk+Jens Bache-Wiig2009-09-221-2/+2
| | | | | | | | | | | | | | We were not respecting the rect offset on combo box arrows. This was preventing the autotest from happily completing with GTK+ style. Reviewed-by: joao
* | Compile on all non-windows platformsEskil Abrahamsen Blomfeldt2009-09-221-0/+2
| | | | | | | | Function is only used from within Q_OS_WIN or Q_WS_WIN-blocks.
* | Cleanup convertHIconToPixmap() & loadIconFromShell32()miniak2009-09-221-7/+24
| | | | | | | | | | | | | | | | Replace convertHIconToPixmap() by QPixmap::fromWinHICON() Move loadIconFromShell32() to qwindowsstyle.cpp Merge-request: 1570 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | When using Plastique style, changing the background style sheet property of aGabriel de Dietrich2009-09-212-1/+4
| | | | | | | | | | | | | | | | spinbox wouldn't set the correct background for the embedded line edit. Reviewed-by: Olivier Task-number: 232085 Task-number: QTBUG-3013
* | Making Keypad Navigation more usableAlessandro Portale2009-09-191-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All changes of this commit are #ifdef'ed in QT_KEYPAD_NAVIGATION. Most desktop Qts won't notice any change. Navigating between QWidgets was not alwys a pleasure on keypad devices. This commit fixes the navigation behavior for some widgets, mostly itemviews. Furthermore, it adds a 'directional' navigation mode. Until now, the existing keypad navigation used the tab order do go back and forth between widgets. The new mode is supposed to provide a more intuitive navigation. It is the new default mode on Symbian. Screens (and their resolutions) become bigger, and also low resolution screens can be used in landscape mode. That's why the directional mode was requested. Another popular request was to put some more convenience into QSlider: If a (horizontal) slider has focus and the user presses left/right, the value of the slider may directing change without being selected (edit mode). This commit also adds the manual test 'keypadnavigation'. Reviewed-by: Shane Kearns
* | Introduce native Symbian bitmap support to QPixmapJani Hautakangas2009-09-181-5/+7
| | | | | | | | | | | | | | | | | | 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
* | Use the proxy in QStyleOlivier Goffart2009-09-171-3/+3
| | | | | | | | Reviewed-by: trustme
* | Fixed groupbox drawing on xp when hitting the fallback code.Gunnar Sletta2009-09-141-1/+1
| | | | | | | | | | | | | | | | | | When swapping the alphachannel we need to make sure we create proper premultiplied pixels. When setting alpha to 0, that means also setting the other pixel values to 0. This bug was made visible by the gl graphics system. Reviewed-by: MariusSO
* | Fixes regression in QStyleSheet regarding QFrame:no-frameOlivier Goffart2009-09-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | In Qt know the frame is drawn in PE_Widget with stylesheet. But the QStyleOption passed by QWidgetPrivate::drawBackground is really simple and doesn't contains frame information. We need to rely on the widget itself to know if we should look for the :no-frame pseudo element. Reviewed-by: jbache Task-number: 261110
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-0961-248/+248
|\ \
| * | Update license headers again.Jason McDonald2009-09-0961-244/+244
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fixed usage of QMargins in QStyleSheetStyleThorbjørn Lindeijer2009-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | The order of the parameters to the QMargins constructor changed in commit 758f4735bcae034ac25730e53bb371df3b7d6e8a. Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | | Fixed 'use of function XXX is deprecated' warning reported by RVCT.Janne Anttila2009-09-091-2/+2
| | | | | | | | | | | | Task-number: 241223