summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.6' into 4.6-upstreamBradley T. Hughes2009-12-093-0/+20
|\
| * Mixed up top/bottomRobert Griebl2009-12-091-1/+1
| | | | | | | | Reviewed-by: trustme
| * QGtkStyle: support for the inner-border property in GtkButtonsRobert Griebl2009-12-083-0/+20
| | | | | | | | | | | | | | | | This additional padding was not taken into account up to now. It didn't matter for desktop themes, but Maemo5 uses a large (8pix) padding that can not be ignored. Reviewed-by: jbache
* | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-11/+11
|\ \ | |/ |/|
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-071-11/+11
| |\ | | | | | | | | | 4.6-staging2
| | * Button and LineEdit/TextEdit theme colors are incorrectSami Merilä2009-12-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style fetches incorrect color values from theme when using buttons and lineEdits/TextEdits. New values are the same as in native widgets (verified from native widget code). Task-number: QTBUG-6364 Reviewed-by: Alessandro Portale
| | * QS60Style: Overwrites correct stylehint color valuesSami Merilä2009-12-041-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style overwrites correct theme colors with QCommonStyle values in QS60Style::styleHint(). In that method returned value is initialized as -1 and then if the value is still -1 after switch statement for different stylehints, the stylehint is queried from common style. Problem is that it is also getting RGB values set into return value. White color as HEX is FFFFFF and -1 as HEX is FFFFFF. So, if theme color is white for Group Text title, or for Grid lines, color is asked from QCommonStyle instead. As a fix, in 'default' case ask from QCommonStyle. Also, use RGBA instead of RGB values. Reviewed-by: Alessandro Portale
| | * QS60Style: Always store changed theme paletteSami Merilä2009-12-031-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When style updates its background brush, it updates QApplication's palette with new background. Also member variable m_backgroundBrush is updated. What is NOT updated is the member variable m_themePalette, which should also contain correct updated palette. This change updates m_themePalette and moves palette updations to occur in one place so that in all use-cases the palettes are modified in a unified way. Task-number: QTBUG-6427 Reviewed-by: Alessandro Portale
* | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-052-3/+19
|\ \ \ | |/ / |/| | | | | oslo-staging-1/4.6 into 4.6
| * | Fixes: Compile fixJens Bache-Wiig2009-12-031-1/+2
| | | | | | | | | | | | | | | Task: Turns out d648f23094e61705ceea10b2af526872406d022a was not properly applied.
| * | Fixes: Support gtk-enable-mnemonics on QGtkStyleJens Bache-Wiig2009-12-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-6484 RevBy: thorbjorn Details: We currently ignore this property. It now maps to SH_UnderlineShortcut.
| * | Improved compatibility with MDI area custom themes on XPJens Bache-Wiig2009-11-111-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With certain custom Windows themes the window mask will be incorrectly set so that the subwindows become unusable. Instead of passing the window rect to the mask region function, we now only pass only the title bar rect and add the remainder at the bottom. This should improve compatibility with certain custom themes such as the Vista Inspirat Pack. Task-id: QTBUG-6271 Reviewed-by: prasanth
* | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-041-2/+1
|\ \ \ | | |/ | |/|
| * | Fixes transformation problems with QGraphicsProxyWidget.Yoann Lopes2009-12-021-2/+1
| |/ | | | | | | | | | | | | | | | | In the paintEvent of the widget used in a QGraphicsProxyWidget, the worldMatrix was wrongly used by the painter instead of the deviceMatrix. Similar problem in the WindowsXP Style, the worldMatrix was used instead of the deviceMatrix for determining if the widget is transformed (reviewed by eblomfel). Task-number: QTBUG-5939 Reviewed-by: bnilsen Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-032-6/+6
|\ \ | |/
| * QWindowStyle: make sure there is no duplicate in the list of scrollbar.Olivier Goffart2009-12-011-4/+6
| | | | | | | | | | | | | | | | Otherwise the list grow and waste memory and CPU each time the stylesheet is changed or the widget is shown Reviewed-by: Thierry Task-number: QTBUG-6409
| * Do not fill the disabled background of item.Olivier Goffart2009-11-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is a regression against Qt 4.5 If one want special background for disabled item, one can use stylesheet, or BackgroundRole This partially revert 127e68d3dc4ff8329 Reviewed-by: jbache Task-number: QT-2388 Task-number: QTBUG-6319
* | compile fix for Qt in namespacehjk2009-12-011-0/+4
|/
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-262-25/+9
|\ | | | | | | 4.6-staging2
| * Tidyup QS60Style - remove unused constants, replace magic valuesSami Merilä2009-11-262-12/+3
| | | | | | | | | | | | | | | | | | | | | | Basically this has three minor fixes: - remove unused style parts that were left over after unifying textEdit and lineEdit graphics - make radiobutton indicator one pixel smaller so it is perfect circle - replace magic "10" with calculated value Reviewed-by: Alessandro Portale
| * Background in landscape mode on S60 5.0 is brokenSami Merilä2009-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | After initial fix, 99% of widgets draw temselves properly after orientation switch. However, QScrollAreas lose their palette hash, which causes scrollarea background to re-start from theme background top-left. As a correction, we re-set the theme palette hash after calling QApplication::setPalette, since that clears palette hash. Task-number: QTBUG-6125 Reviewed-by: Alessandro Portale
| * Remove some white-space from QS60StyleSami Merilä2009-11-261-5/+5
| | | | | | | | | | | | Remove some white space from QS60Style classes. Reviewed-by: TrustMe
| * Fixing background painting after orientation switch.Alessandro Portale2009-11-252-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing previous fixes of QS60StylePrivate::setBackgroundTexture with commit SHAs a80e58335e69c8ce96d1596e0ed2d14e424a0d5e and d4089399a3ab7548a864d5a399e08df85c444783 Now, the palette gets the updated background brush and the palette is actually set as application palette. Also making sure that QS60StylePrivate::handleDynamicLayoutVariantSwitch does the right things in the right order. So that Table headers are not broken after orientaion switch. Task-number: QTBUG-6125 Task-number: QT-1478
| * Micro optimizationAlessandro Portale2009-11-251-1/+1
| | | | | | | | | | | | Don't request a palette if you do not use it. Reviewed-By: Trustme
| * Removed unused setThemePalette(QStyleOption *option)Alessandro Portale2009-11-252-7/+0
| | | | | | | | | | | | Not used or missed, anywhere. Reviewed-By: Trustme
* | Background in landscape mode on S60 5.0 is brokenSami Merilä2009-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | After initial fix, 99% of widgets draw temselves properly after orientation switch. However, QScrollAreas lose their palette hash, which causes scrollarea background to re-start from theme background top-left. As a correction, we re-set the theme palette hash after calling QApplication::setPalette, since that clears palette hash. Task-number: QTBUG-6125 Reviewed-by: Alessandro Portale
* | Fixing background painting after orientation switch.Alessandro Portale2009-11-252-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing previous fixes of QS60StylePrivate::setBackgroundTexture with commit SHAs a80e58335e69c8ce96d1596e0ed2d14e424a0d5e and d4089399a3ab7548a864d5a399e08df85c444783 Now, the palette gets the updated background brush and the palette is actually set as application palette. Also making sure that QS60StylePrivate::handleDynamicLayoutVariantSwitch does the right things in the right order. So that Table headers are not broken after orientaion switch. Task-number: QTBUG-6125 Task-number: QT-1478 Reviewed-by: Shane Kearns
* | Offset in MDI subwindow bar buttons under Mac OS 10.6Gabriel de Dietrich2009-11-251-3/+5
|/ | | | | Task-number: QTBUG-5830 Reviewed-by: Richard
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-staging2axis2009-11-241-1/+1
|\
| * Fix background rendering for read-only comboboxes on Maemo5Robert Griebl2009-11-231-1/+1
| | | | | | | | Reviewed-by: jbache
* | Mac: Fixes broken window decorations for QGraphicsProxyWidget.Bjørn Erik Nilsen2009-11-241-2/+2
|/ | | | | | | | | | | | | The problem was the QMacStyle didn't handle the pixel metric for PM_TitleBarHeight correctly when passing a style option containing an unitialized rect (empty rect). It already had special logic for invalid rects, so the fix is simply to extend the check to also handle empty rects. Auto-test included. Task-number: QTBUG-4160 Reviewed-by: msorvig
* Fix QCombobox painting regression on WindowsOlivier Goffart2009-11-191-2/+0
| | | | | | | | | Some style relies on this broken behaviour that was fixed in commit e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1 The text on the combobox uses the wrong palette role. Reviewed-by: jbache
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-192-25/+47
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-181-0/+4
| |\ | | | | | | | | | 4.6-staging2
| | * QS60Style returns hint QFormLayout::WrapLongRowsAlessandro Portale2009-11-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | To get a mobile friendly 1-column layout, we can set QFormLayout's rowWrapPolicy. S60Style should return QFormLayout::WrapLongRows as the SH_FormLayoutWrapPolicy styleHint. Reviewed-by: Jason Barron
| * | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-172-3/+18
| |\ \ | | |/ | |/|
| * | LineEdit graphics are sometimes missing from webpages with s60styleSami Merilä2009-11-172-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the webpage does define BODY colors for background, it is possible that lineEdits are not drawn at all. Actually, they are drawn but with transparent background, which makes them near-invisible. This is due to that QS60Style tries to check if the themePalette has been changed and if it has forwards the drawing of that particular widget to common style. Common style unfortunately uses active style's palette to draw the widget. S60Style defines Base to be transparent (to get the theme background shine through) and common style tries to use Base to draw lineEdit. End result is transparent lineEdit on webpage. This fix makes more educated deduction when it tries to see if style has been changed. This is related to QTBUG-4885. Task-number: QTBUG-4885 Reviewed-by: Janne Koskinen
* | | Fix multiple regressions in QGtkStyle caused by freetype fixesJens Bache-Wiig2009-11-182-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.6 reports smaller sizes for all fonts which means a lot of the size adjustments QGtkStyle does were now off. I have adjusted most of them including some fixes to menu items themselves. Note that the changes were introduced with this change: 04d18b38c38c5ff623b30366ea08d56128b9b7d0 We now also adapt to GNOME 2.16 style submenu arrow sizes. Combo boxes, line edits, spin boxes and push buttons should finally have a uniform height. Task-number: QTBUG-5753 Reviewed-by: thorbjorn
* | | Fix QGtkStyle crash when switching themes.Robert Griebl2009-11-182-31/+46
| | | | | | | | | | | | | | | | | | | | | This is a workaround for a bug that we introduced with the QGtkStyle refactoring to properly support Maemo5. RevBy: jbache
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-183-3/+19
|\ \ \
| * | | register pointer type for invokeRobert Griebl2009-11-181-0/+4
| | |/ | |/|
| * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-172-3/+15
| |\ \ | | |/
| | * Fixed tab and tab contents frame overlapping when using style sheetsGabriel de Dietrich2009-11-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting the contents frame layout, the overlapping amount used was the one from the base style because we were checking the wrong widget. We now ensure that it's the QTabWidget we are checking for the pane pseudo-element subrule. Reviewed-by: Olivier Task-number: QTBUG-2555
| | * Define own palette for web-based widgets in QS60StyleSami Merilä2009-11-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes no sense to use the S60-theme based palette in web based widgets. Web pages do not generally show theme background, but their own (or by default white) which clashes badly with WindowText and Text that are set to work with theme background. Therefore, QWebView and QGraphicsWebView need to be set their own palette for texts in theme palette hash. This improves visibility of text in webkit when QS60Style is active. Task-number: QTBUG-4885 Reviewed-by: Janne Koskinen
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-173-6/+24
|\ \ \ | |/ /
| * | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-172-3/+18
| |\ \ | | |/ | |/|
| | * doc: Fixed qdoc errors.Martin Smith2009-11-161-0/+8
| | |
| | * doc: Fixed qdoc errors.Martin Smith2009-11-161-3/+10
| | |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-131-1/+1
| |\ \ | | | | | | | | | | | | 4.6-staging2
| | * | Highlighted text colour correction for s60styleJanne Koskinen2009-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed s60style HighlightedText to pickup the correct colour from S60 themes. Task-number: QTBUG-5709 Reviewed-by: Sami Merila
generated by cgit v0.12 at 2024-12-01 00:24:51 (GMT)