summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* QGtkStyle: remove an unnecessary sanity check for theme nameDmitry Shachnev2013-04-111-4/+1
| | | | | | | | | | This makes QGtkStyle working again on Debian experimental and Ubuntu 13.04, where getThemeName() returns empty value. Backported from QtBase b72aa1cad30a44b1. Change-Id: If4cc822970088a5fb31aa28d9951db1efc0bb4fd Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QWindowsVistaStyle::drawPrimitive(PE_Frame): fix background clippingJ-P Nurmi2013-03-211-10/+7
| | | | | | | | | | | | | | | The purpose of PE_Frame is to draw the frame, not the background. The old code tried to check whether a custom base brush was set, and otherwise let the theme draw the background. That didn't work together with CSS background images. This change removes the background drawing from PE_Frame, and let's PE_Widget to draw the background using the base brush that defaults to a color fetched from the theme. Task-number: QTBUG-24783 (cherry picked from qtbase/f1e681bed21e131864fe1e1c91679f7a56b06823) Change-Id: Ief256d1d5861abc95dedf0b5d0a4f8e338c48941 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Check for gtk_adjustment_configure as this is not always implementedAndy Shaw2013-01-141-1/+3
| | | | | | | | | | | | | | Some implementations seem to not have the gtk_adjustment_configure function implemented so we check for this so that there is no problem when it tries to use it. Task-number: QTBUG-23569 QTBUG-25760 Change-Id: I777ce09268f86907f3da3cede408c9a41be566cf Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Karim Pinter <karim.pinter@digia.com> (cherry picked from qtbase/7fcf1cf674d09d9dd1d41e2913252017f1d599ca)
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1364-64/+64
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Mac: Fixed text rendering in selected tab buttonGabriel de Dietrich2013-01-071-22/+11
| | | | | | | | | | | We resort to custom Qt rendering when selected since it looks better than using Carbon's HITheme engine. This is a backport of Qt 5's 65b39b3cdcdfe175d80ccf9428168ed51be77fd8, and also reverts commit f7bba6cc700f5f6b1ff6a40b8c475924de206022. Change-Id: I684db730f05bead16e16a0d1c8f20164e9fc70b7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Modified vertical alignments of simple widgets on OSXTero Ahola2012-12-141-7/+7
| | | | | | | | | | | | | | | | Adding QCheckBox, QComboBox, QLineEdit etc. into an HBox layout or grid layout makes the layout look like a snake's trail. Fixed the positioning of these widgets to make the layouts visually more appealing. Updated qmacstyle auto-test accordingly. Task-number: QTBUG-13635 Ammended-by: Gabriel de Dietrich Ammended-by: Liang Qi Change-Id: Ic12346f764d8092292b8388f50d184b37d7cef5f (cherry picked from qtbase/8b6de4677142cab41790ca50ce6c7f1efbab5de8) Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Draw disabled QMenu items in inactive state in vista style.Friedemann Kleint2012-11-281-1/+1
| | | | | | | | Task-number: QTBUG-27992 Change-Id: I4ed5661cfe0d0a10143224b73fbad6fac4927a37 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/5223e7eb27dc15f8428aeb66dd8c57098dedce58)
* QWindowsVistaStyle: Restore altered brush origin.Friedemann Kleint2012-11-071-1/+2
| | | | | | | | | | | | The line to restore it was missing, and the leftover variable caused a warning, which was removed in abe5a0a432116963d22c4ef501a4dfd2393d66fb . Task-number: QTBUG-27828 Change-Id: I00b8b89b07bec38a1660c3a9c61220b6d0d7eb48 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> (cherry picked from qtbase/96ebbad5f03d6db5fa81f284ccbdaf4b6259c27b)
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2964-1527/+1527
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove warning about non existing paint device engineTitta Heikkala2012-08-231-25/+27
| | | | | | | | | | | | | | | The QWindowsVistaStyle::drawPrimitive() method was trying to draw the pixmap for an item in an item view even if the section width was zero or less then zero. This resulted "QPainter::begin: Paint device returned engine == 0, type: 2" error. It's now checked that the width and the height of the section is greater than zero before creating the painter. Task-number: QTBUG-26047 Change-Id: I36dd2792fd505be773951e5ac36b0e3362ec2292 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 929e934969c621d7c1773e4233c14d358de4d385)
* Update contact information in license headers.Sergio Ahumada2012-08-0164-128/+128
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Use improved QLibrary search heuristics for libgtkSean Harmer2012-07-271-0/+1
| | | | | Change-Id: Id9bdb0199f926d1a518a94080285f96f0810cf92 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDial: Fix crash when singleStep-property is 0.Friedemann Kleint2012-02-151-1/+3
| | | | | | | Task-number: QTBUG-23072 Change-Id: I296b46af23420b24fa5460b9660e33bf203ea29f Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1164-64/+64
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-152-0/+102
|\ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Improved performance of mapFromGlobal/mapToGlobal on X11" Fix QDockWidget titlebar button positioning on Mac OS X Fixed memory leak in Windows Vista style widgets
| * Fix QDockWidget titlebar button positioning on Mac OS XPasi Matilainen2011-11-141-0/+101
| | | | | | | | | | | | | | | | | | Move the QDockWidget close and float buttons from the right end of the dock widget title bar to the left end to avoid Mac App Store rejection. Task-number: QTBUG-19493 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Fixed memory leak in Windows Vista style widgetsTero Ahola2011-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | The animations are now deleted in destruction of the Vista style. With the previous implementation the animations were not deleted for instance if you move mouse cursor off from a widget with hover animation (like QPushButton). Task-number: QTBUG-21532 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-121-3/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed wrong QGroupBox check state Added base 10 to be used with QIntValidator. Mac: Fix the color of check marks in menus with stylesheet Russian translation update Don't directly access QList contents Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
| * Mac: Fix the color of check marks in menus with stylesheetTero Ahola2011-11-111-3/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-16989 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Morten Johan Sorvig <morten.sorvig@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-102-23/+37
|\ \ | |/ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Repaint QProgressBar when minimum or maximum changed Fix QProgressBar causing timer event spam Compile fix for Mac OS X 10.7 with 10.6 sdk
| * Fix QProgressBar causing timer event spamTero Ahola2011-11-102-23/+37
| | | | | | | | | | | | | | | | | | | | | | On Windows you will get a lot of timer events if you use QProgressBar widget. This is because QWindowsStyle uses a timer to animate a progress bar with unknown state (min and max values both zero). The issue was fixed by starting the timer only if needed. Task-number: QTBUG-10501 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fix memory leak in S60StyleMiikka Heikkinen2011-11-081-1/+3
|/ | | | | | | The m_animations contents were never deleted. Task-number: QTBUG-22603 Reviewed-by: Sami Merila
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-283-14/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian configuration parameter change for linux building Improve patch_capabilities script output. Fix QtSql autotest server addresses Update SQLite version number in legal document Update SQLite version mentioned in licence document Symbian Linuxification building case changes Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian Symbian - fix compile error when default configured
| * Symbian Linuxification building case changesPasi Pentikainen2011-10-201-5/+1
| | | | | | | | | | | | | | Changes the libraries to match the case of files for building Symbian in linux. Reviewed-by: Miikka Heikkinen
| * QS60StyleAnimation exception safetymread2011-10-182-9/+5
| | | | | | | | | | | | | | | | | | | | QS60StyleAnimation had a number of exception safety problems. - Exceptions from QS60StyleAnimation/V2 could panic a TRAP harness. - Pointers could be uninitialised on exception in constructor. Problems solved by switching to QScopedPointer and simplifying the code. Task-number: QTBUG-4871 incidental finding Reviewed-by: Sami Merila
* | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-172-9/+9
|\ \ | |/
| * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-144-8/+8
| |\
| * | Converting from double to qreal in guimread2011-10-102-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a number of places in QtGui where doubles were used in expressions due to the use of floating point constants in the code. Many of these constants are now constructed as qreal, removing the use of double operations where unneeded. These changes have been limited to constants that have exactly the same value whether double or float, to ensure that precision errors are not introduced. This should not affect any of the desktop platforms where qreal is double. On Symbian, where qreal is float, appropriate autotests have been run. Task-number: QTBUG-4894 Reviewed-by: Sami Merila
| * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-201-11/+7
| |\ \
* | | | Fixed resource leak when setting QProgressBar style sheetTero Ahola2011-10-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19110 Merge-request: 2687 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-074-8/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)miniak2011-10-064-8/+8
| | | | | | | | | | | | | | | | | | | | Merge-request: 1272 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | fix possible race conditionsKonstantin Ritt2011-10-072-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | the initialization guard must be set after the initialization is done; for the code assumed to be only executed in a single thread, this change was done just for consistency - in order to avoid similar issues by copy-pasting in future Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-202-33/+61
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits) runonphone: Include USB serial ports on OS X for CODA, too runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name runonphone: Allow overriding the temporary sis file name Fix QIcon auto-tests for Symbian Add a cast to moc cpp generator to remove armcc warnings Fix qt.conf for Symbian to use $${EPOCROOT} Remove few unused variables. ...
| * Regression in QS60Style when drawing webview scrollbarsSami Merila2011-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QWebviews draws scrollbar background with bright green. This is regression caused by QS60Style change SHA 7dfa50a9b97d28813341329a55aa1a4b5a7de527. This SHA changed theme background creation to happen just before drawing. Unfortunately, web widgets have slightly different palette than non-web widgets, so the style didn't catch the incorrect background texture when painting. Thus, the background was drawn with initialized color (green). Task-number: QTBUG-21463 Reviewed-by: Miikka Heikkinen
| * QS60Style: Make spinboxes and lineedits slightly tallerSami Merila2011-09-081-6/+12
| | | | | | | | | | | | | | | | | | | | Make spinboxes and lineEdits as tall as comboboxes are. This makes these components to look more like native components. Since spinbox frame width was previously zero, changing the value revealed some button positioning issues. Task-number: QT-4175 Reviewed-by: Miikka Heikkinen
| * Fix a bad merge of qs60style.cppSami Merila2011-09-051-3/+0
| | | | | | | | | | | | | | Merge cf2f72f4f61f3a9e0e7573379c33bb341eeba7be caused QS60Style.cpp to pick up unrelated changes from Qt4.7 branch. Reviewed-by: Miikka Heikkinen
| * Fix Coverity findings from QS60StyleSami Merila2011-09-022-5/+9
| | | | | | | | | | | | | | Fix issues found out by static analysis tool Coverity from QS60Style. Task-number: QT-4843 Reviewed-by: Miikka Heikkinen
| * Remove whitespace from S60 style codes.Miikka Heikkinen2011-09-022-15/+15
| | | | | | | | Reviewed-by: TrustMe
| * Fix center aligned layouts for Symbian.Miikka Heikkinen2011-09-021-9/+11
| | | | | | | | | | | | | | | | | | Default layout bottom margin for Symbian was double that of top margin, causing center aligning to fail noticeably for smaller layouts. Made default margins more sensible. Task-number: QTBUG-14704 Reviewed-by: Sami Merila
| * Improve robustness of QS60Style when creating native theme bitmapsSami Merila2011-08-311-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | Three robustness improvements: a) When doing a compatibility check for a style part, make check always pass if the part is supported by all platform versions. b) Re-attempt icon creation without a mask, if creation with mask fails. c) Paint theme background with white (instead of just giving up) in error cases. Task-number: QTBUG-21119 Reviewed-by: Miikka Heikkinen
* | Ensure that the proxystyle is used over the style's own functionsAndy Shaw2011-09-071-11/+7
|/ | | | | | | | | | | When calling a style function such as pixelMetric() then this should be done via the proxy style and not on the style directly. This is so that the proxy style always has a chance to override the original style's implementation and still preserve the fallback to the base style. Task-number: QTBUG-20849 Merge-request: 2645 Reviewed-by: olivier
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-08-271-2/+5
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Check if bridge plugin vector is still valid. QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
| * QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: ↵peterpa2011-08-251-2/+5
| | | | | | | | | | | | | | incorrect work with list Merge-request: 2664 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-271-5/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed use of deleted object in XmlPatterns EvaluationCache Crash when creating scroll bar skin graphics on S60 (debug only) QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Make it easier to select words at the start of a line. Doc: Fixing typo In landscape mode QComboboBox popup can not be showed completely Fix left alignment of native RTL pre-edit text.
| * Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-261-5/+9
| |\ | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
| | * Crash when creating scroll bar skin graphics on S60 (debug only)Sami Merila2011-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fetching bitmap graphics from native without fallback information, do not define fallback-mif file, since native side uses ASSERT_DEBUG to crash the client if file info exists, but bitmap ID is not defined. This started crashing when root theme removed default scrollbar graphics from its content for Belle release. Task-number: QTBUG-15993 Reviewed-by: Miikka Heikkinen
| | * QS60Style omits drawing theme background in some Symbian SDKsSami Merila2011-08-251-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest internal RnD releases have upgraded Symbian version to 5.4. As QS60Style was not aware of this, all the textures that didn't define any version information (i.e. available in all versions) were not drawn at all. Task-number: QT-5176 Reviewed-by: Miikka Heikkinen
* | | Fix bug QTBUG-13901, Mac style button rectChris Meyer2011-08-121-1/+1
|/ / | | | | | | | | Make sure that clicks in the corners of buttons with Mac style are treated properly. Added test case.
* | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-131-5/+5
|\ \
generated by cgit v0.12 at 2025-01-15 19:22:45 (GMT)