summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* Fixes: Cosmetic fix for maemo spin boxJens Bache-Wiig2010-01-151-1/+1
| | | | | | | Reviewed-by: rgriebl Description: We pass the wrong gtk style the the background. For most desktop styles this has no affect, but it breaks on Hildon.
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-134-8/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) really, *really* fix the test :} QFile cannot deal with crlf-translated stdio, so use binary mode remove trimming of (expected) output really fix the autotest support regexp-like quantifiers of expected output lines remove superfluous \r filtering print actual rather than expected output for matching text Do not set the font size unnecessarily in the simulated s60 style. Doc typos fixed Translations: Update German for 4.6.1 fix test under windows don't complain about unresolved base when the reference is absolute make the lupdate tests more verbose in case of failure don't use qmake for test setup move equivalent of output_ts test to good/ look for the .result file in the dir where the output is expected to go fix sametext and number heuristics fix number heuristics, part 1 no point in specifying -ts when a .pro file is specified clean up the lupdatecmd files ...
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-1361-142/+160
| |\ | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testlupdate.cpp
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-124-8/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (21 commits) QFile cannot deal with crlf-translated stdio, so use binary mode remove trimming of (expected) output really fix the autotest support regexp-like quantifiers of expected output lines remove superfluous \r filtering print actual rather than expected output for matching text Do not set the font size unnecessarily in the simulated s60 style. Doc typos fixed Translations: Update German for 4.6.1 fix test under windows don't complain about unresolved base when the reference is absolute make the lupdate tests more verbose in case of failure don't use qmake for test setup move equivalent of output_ts test to good/ look for the .result file in the dir where the output is expected to go fix sametext and number heuristics fix number heuristics, part 1 no point in specifying -ts when a .pro file is specified clean up the lupdatecmd files tidy up the test .pro files ...
| | * | Do not set the font size unnecessarily in the simulated s60 style.Christian Kamm2010-01-114-8/+18
| | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | | | Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-1261-143/+161
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: dist/changes-4.6.1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-1261-142/+160
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (73 commits) doc: update snippets for QtScript function expressions Prevent a crash when creating an inputContext from the QApplication dtor. QNAM HTTP Code: Cache socket state inside ensureConnection() tst_qhttpnetworkconnection: Test also HEAD in some tests tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities QNAM HTTP Code: When starting new request, prefer connected sockets. typo fix Added the 'framecapture' WebKit example to the default build. Fix code example fix typo in qreadwritelock's documentation QNAM HTTP: Don't call d_func() so often QNAM HTTP: Fix readBuffer maximum size. QNAM HTTP: Optimize eatWhitespace() QNAM HTTP: Check if socket already tries to connect. network internals: fix build on S60 [syncqt] Make -separate-module work with WebKit's directory structure doc: Corrected explanation of when append() does nothing. doc: Added clarification about allocating space for the 0 terminator. Add a way to access the normalised URL in QUrl. [syncqt] Make it possible to synchronize headers for a separate module ...
| | * | Fixes: Fix spinbox with NoButton style in QGtkStyleJens Bache-Wiig2010-01-081-44/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-6952 RevBy: ogoffart Details: We simply need to handle this case explicitly to draw like a GtkEntry.
| | * | Fixes: Setting any style sheet breaks checkbox positioningJens Bache-Wiig2010-01-081-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7198 RevBy: ogoffart Details: It was impossible to override the checkbox positioning in a custom style if any style sheet was set on the application of widget. This was because the style sheet never passed control to the base style. We now fix it by checking if the style sheet has the appropriate style rules.
| | * | Fixes: MenuItem size fixes and missing separator with Gtk+Jens Bache-Wiig2010-01-083-28/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-6522 RevBy: thorbjorn Details: This fixes missing separator line in the Dust theme. The patch also significantly improves the accuracy of menu item size metrics by making use of gtk_widget_size_request to query things like default heights. - More accurate offset and size of separators - Fixed item height of menu items using size_request - Fixed vertical offset of label and check boxes - Fixed clipping issue on last menu item
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0761-65/+67
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-061-4/+6
| | | |\
| | | | * doc: Clarified activeSubControls and subControls.Martin Smith2010-01-061-4/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6405
| | | | * doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6615
| | | * | Update copyright year to 2010Jason McDonald2010-01-0661-61/+61
| | | |/ | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Fix for QTBUG-7267 Qs60Style::drawControl() does not align CE_ItemViewItemJani Hautakangas2010-01-111-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | control element correctly if given widget is null. Uses now alignment hint value given in style option. Task-number: QTBUG-7267 Reviewed-by: Janne Koskinen
* | | Fixes warning in the QMacStyleOlivier Goffart2010-01-112-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | Warning such as QFont::setPointSizeF: Point size <= 0 (-1.000000), must be greater than 0 because the font size might be specified in pixel, and pointSizeF returns -1 if the font size is in pixel (as documented) Reviewed-by: jbache Task-number: QTBUG-7263
* | Revert "QStyleSheetStyle: Fixed some text croped when having padding with ↵Olivier Goffart2010-01-061-1/+1
|/ | | | | | | | | | native border." This reverts commit 6e90192b599cee9b903177a0978198326f667613. his change the behaviour a little bit. It is better to wait for Qt 4.7 Reviewed-by: jbache
* QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2009-12-281-1/+1
| | | | | | | The native border width need to be taken into account in QRenderRule::boxRect() Task-number: QTBUG-6855 Reviewed-by: Benjamin Poulain
* Minor optimization for QS60StyleSami Merila2009-12-231-3/+3
| | | | | | | Ask selected state only once in QS60Style when handling element CE_TabBarTabLabel. Reviewed-by: TrustMe
* Correcting white space in QS60StyleSami Merila2009-12-231-76/+76
| | | | Reviewed-by: TrustMe
* QComboboxes are squeezed in QVGA screensSami Merila2009-12-231-29/+31
| | | | | | | | | | | ComboBoxes and SpinBoxes are squeezed in QVGA screens, due to dodgy style calculations. This fix ensures that sub-widget buttons for these widgets are always square. Task-number: QT-2158 (internal) Reviewed-by: axis
* Setting background color to a QDialog doesn't workSami Merila2009-12-231-1/+4
| | | | | | | | | | | | Since dialogs use their own theme graphics for background, regular method of checking the palette fails (as generic background brush is probably unchanged). Therefore to check if the dialog background is using default (=theme graphic), it needs to check the cache key value of background - so that it matches with the one in stored theme palette. Task-number: QTBUG-5898 Reviewed-by: Janne Koskinen
* QWidget with the window flag Qt::Dialog is not decorated as a dialogSami Merila2009-12-231-1/+1
| | | | | | | | | | | Previously style casted widgets to QDialog to see if it is able to draw dialog background theme graphic. As a fix, we now query window flag from the widget and if it is equivalent of Qt::Dialog, draw dialog background. Task-number: QTBUG-5930 Reviewed-by: Janne Koskinen
* Device flickers badly when orientation change occursSami Merila2009-12-232-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently what happens when orientation changes is: 1. Application gets notification that status pane size has changed. 2. Qt resizes S60Data to new size, and sends resize event. 3. Application redraws itself. But style is still using incorrect screen size internally, so background brush is incorrect. Redrawing thus might showup white rect on-screen. 4. Style gets notification that orientation is changed and style then deletes existing background brush. 5. Style creates a new background brush and sends events to all toplevel widgets that style has changed 6. Widgets might draw themselves with new style background brush. What this fix changes is: 1. When application first tries to redraw itself, style notices that the background brush size does not match to active screen size. 2. Style immediately re-creates background brush 3. Since cachekey for pixmaps won't match, new background is not drawn until after background brush has been updated to application palette. 4. Due to #1 style needs to remove deletion of background brush from clearCaches to avoid deleting (and re-creating) background twice. Task-number: QTBUG-6428 Reviewed-by: Janne Koskinen
* qreal-izationAleksandar Sasha Babic2009-12-152-2/+2
| | | | | | | | | Using math wrapper functions instead direct call. This gives us top-level control to what (single/double) precision we are effectively using. Task-number: QTBUG-4894 Reviewed-by: janarve Reviewed-by: Kim Motoyoshi Kalland
* QS60Style: Remove layouts with mirrored informationSami Merila2009-12-152-32/+15
| | | | | | | | | | | | | | Currently QS60Style stores pixel metrics values (96 of them for each layout) in a static lookup table. There is one "line" for each screensize, orientation and layout direction (ten in total). This fix removes the layout direction specific "lines" as there are only two pixel metrics values that differ depending on direction. We can handle those two inside QS60Style::pixelMetrics() and thus remove half of the rows, and thus gain 16*96*5 ~ 8kB of RAM. Task-number: QTBUG-6803 Reviewed-by: Alessandro Portale
* QS60Style: Theme graphics for QSlider in 3.1Sami Merila2009-12-111-2/+6
| | | | | | These were missed from previous fix. Reviewed-by: Alessandro Portale
* QS60Style: Groove changes caused build break of S60 3.1Sami Merila2009-12-114-11/+36
| | | | | | | | 3.1 does not have theme graphics IDs that we use in style, so it cannot be compiled in 3.1. As a fallback, 3.1 will use the previous method of drawing a slider. Reviewed-by: Alessandro Portale
* QS60Style: Style does not support pressed state for slidersSami Merila2009-12-113-30/+52
| | | | | | | | Currently there is no visual clue that slider is "sunken" (pressed state). There is S60 theme graphic for it, so lets use it. Task-number: QTBUG-6722 Reviewed-by: Janne Koskinen
* QS60Style: Slider groove is incorrectSami Merila2009-12-113-28/+50
| | | | | | | | Style uses just a line as slider groove, when S60 provides themed graphics for it as well. Task-number: QTBUG-6723 Reviewed-by: Janne Koskinen
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-114-3/+39
|\ | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| * 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 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
* | | | List item is not highlighted before navigating the listSami Merilä2009-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style does not draw highlight for a list that user has not navigated in yet. Once user makes navigation attempt, highlight is drawn to correct index. This was due to that QS60Style only used State_Selected for deducing where highlight should be drawn to. Task-number: QTBUG-6357 Reviewed-by: Janne Anttila
* | | | QS60Style: Do not let QCommonStyle draw PE_PanelScrollAreaCornerSami Merilä2009-12-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QS60Style lets QCommonStyle to draw PE_PanelScrollAreaCorner, common style draws transparent small rect to the end of scrollbar. This is due to our style's palette's Base is Qt::Transparent. Error is only visible when two dialogs/windows are on top of each other and their background is such that a hole in the upper dialog's background will make the hole "visible" (i.e. background is not similar). As a fix, QS60Style should not let QCommonStyle draw the primitive, but instead handle itself (and do nothing with it). Task-number: QTBUG-6657 Reviewed-by: Alessandro Portale
* | | | Crash: when opening the File Dialog in Media Player (armv5)Sami Merilä2009-12-084-470/+296
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to NGA API changes in Tb9.2. Because of API changes, S60Style needs to have a lot of internal changes. First, the changed style no longer itself tries to uncompress and handle CFbsBitmaps, but instead uses the QPixmap backend for it. Second, all references to CFbsBitmap::DataAddress() have been removed. Third, the lookup table for theme parts has been cleaned up. Task-number: QTBUG-4644 Reviewed-by: Janne Koskinen
* | | 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 '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
|\ \ | |/
generated by cgit v0.12 at 2025-03-10 03:55:40 (GMT)