summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* doc: Added info on two ways to customize the style.Martin Smith2009-06-162-10/+19
|
* doc: Fixed several qdoc errors.Martin Smith2009-06-161-5/+8
|
* doc: First review of QProxyStyle doc; mainly just corrected qdoc errors.Martin Smith2009-06-152-47/+97
|
* CompileJens Bache-Wiig2009-06-123-0/+559
| | | | | | Adding missing files for proxy style after commit 4d0cc0b9600f8530bb0e8712b4bb109d1810c4a7 Reviewed-by: trust me
* Integrating QProxyStyleJens Bache-Wiig2009-06-1213-737/+784
| | | | | | | | | | | | This class adds convenient support for proxy styles in Qt. Note that to support proper proxying, styles now call their functions through proxy() so that the proxy regains control over subcomponents. Note that there is a small price to be payed by the extra function call which can at the cost of readability be redirected to the private class member in the future. Task-number: 229556 Reviewed-by: trond
* Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Skip empty parts in KDEDIRSJoão Abecasis2009-06-091-1/+1
| | | | | | | | | | | | | | If KDEDIRS was set to an empty string, this would unintentionally bring /share into the icon search path. Reviewed-by: Olivier Goffart
* | small change in a string, using startsWithThierry Bastian2009-06-111-1/+1
| |
* | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-115-14/+14
| |
* | Make sure custom arrow images works if we only specify it.Olivier Goffart2009-06-111-4/+14
| | | | | | | | | | | | | | | | Include change for spinbox, combobox, and menu. Task-number: 255849 Tested-by: Pierre Reviewed-by: jbache
* | Fix focus frame on combobox on non-Windows stylesOlivier Goffart2009-06-093-3/+5
| | | | | | | | | | | | | | | | | | State_KeyboardFocusChange only makes sens on Windows. Follow the logic on the combobox as in PE_FrameFocusRect in the QWindowsStyle Task-number: 255482 Reviewed-by: jbache
* | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-1/+4
|\ \ | |/
| * BT: Fixes Crash when deleting a QProgressBar which has been styled with ↵Olivier Goffart2009-06-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | QMotifStyle Same fix as in e9a7e43031d7c1ee712e43be682c4e2c183759c4 but with motif Reported by https://bugs.kde.org/show_bug.cgi?id=193911 Task-number: 255138 Reviewed-by: jbache
* | Make inverted appearance work for progressbar in QMacStyleNorwegian Rock Cat2009-06-041-1/+13
| | | | | | | | | | | | | | | | | | HITheme doesn't seem to support the reverse thing. I filled a bug about it, but this is easy to emulate in the horizontal case and the "Inverted" orientation works great for vertical. Task-number: 217594 Reviewed-by: Morten Sørvig
* | Removed the internal UsePixmapCache flag in the style code.jasplin2009-06-046-57/+35
| | | | | | | | | | | | | | | | In the style code, the internal UsePixmapCache flag made no sense in practice, so it was removed. A fortunate side-effect of the patch is that the code is now accepted by Sun CC 5.5. Reviewed-by: jbache
* | Ensure small and mini headers aren't bigger than "large" ones.Norwegian Rock Cat2009-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | We were only "constraining" headers if they were large, but ignoring the small and mini ones. This resulted in the small and mini headers looking bigger than their normal ones which looked strange. Since the headers have no real small or mini size for a header, we'll make sure to constrain them all the same. Task-number: 221115 Reviewed-by: Richard Moe Gustavsen
* | improved string operations all over the placeThierry Bastian2009-05-282-4/+5
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Use Qt::UniqueConnection instead of disconnect/connectOlivier Goffart2009-05-281-6/+2
| | | | | | | | | | | | | | Also fix an issue in QTreeView where a signal could be connected several times Reviewed-by: Thierry
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-272-36/+38
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * Fixed: Setting a border using stylesheet for QComboBox adds an unwated frame.Olivier Goffart2009-05-271-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was already fix. But there was still a frame if there was a stylesheet on the applicaiton. The reason is that the frame's constructor call the style for some hints. And later the combobox will query the style again for the frame hint, before the view get polished. The problem is that the StyleSheetStyle will fill the css cache with wrong information on the first call. This is not visible if there is no stylesheet as in the constructor, the widget style is still the default application stylesheet if there is no global applicaiton stylesheet. Task-number: 254589 Reviewed-by: jbache BT:
| * Fixed a possible assert in QGtkStyleJens Bache-Wiig2009-05-271-32/+31
| | | | | | | | | | | | | | | | | | | | | | We now set and unset the GTK_HAS_FOCUS flag on the same painting call only if focus is set instead of resetting it on each painting call. This is a tiny optimization but also kills a possible assert on certain versions of Gtk+ (as reported with Red Hat Enterprise Linux 5). Task-number: 254614 Reviewed-by: denis
| * Fix a painting issue in the QGtkStyle statusbarJens Bache-Wiig2009-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | We should use the "statusbar" string when we draw the sizegrip. Since gtkstatusbar is the only gtk widget using the paint_resize_grip and it uses the "statusbar" string itself it should be safe to assume this. Task-number: 254535 Reviewed-by: rosch
* | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-256-13/+13
| | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
* | Disable the SH_Menu_AllowActiveAndDisabled on plastique style.Olivier Goffart2009-05-221-0/+5
| | | | | | | | | | | | | | | | | | | | This restore the KDE3's behaviour. Do not disable it on Windows as we are aware of customer using the QPlastiqueStyle on Windows that might rely on this (for behaviour consistancy with others Windows applications) Reviewed-by: jbache Task-number: 254210
* | Merge branch '4.5'Thiago Macieira2009-05-221-6/+7
|\ \ | |/ | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp
| * Fixes a potential crash when changing system palette with QGtkStyleJens Bache-Wiig2009-05-221-6/+7
| | | | | | | | | | | | | | | | | | The problem was that we installed an eventfilter regardless if the gtk symbols were defined or not. Instead we now initialize and check for the symbols before we install the filter. Task-number: 254342 Reviewed-by: ogoffart
* | Merge branch '4.5'Thiago Macieira2009-05-222-23/+6
|\ \ | |/
| * Fix Qt does not compile when glibc < 2.3.2 on linuxJens Bache-Wiig2009-05-221-22/+5
| | | | | | | | | | | | | | | | | | Rather than try to resolve functions or impose configure time limitations we simply remove the dependancy entirely and rely on the fallbac for all platforms. Task-number: 250731 Reviewed-by: thiago
| * Fix toolbutton text incorrectly clipped on windowsJens Bache-Wiig2009-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In 4.5 the toolbutton icon rendering was changed somewhat and the bottom line of text for tool buttons icons with TextUnderIcon set is incorrectly clipped on Windows. The style reserves only 5 pixels but tries to use 6 pixels for text and icon spacing, hence we adjust the text rect one pixel up. This should be safe considering the fact that we have a margin on both sides of the icon already and avoids actually moving the icon positioning. Task-number: 252554 Reviewed-by: trond
* | Merge commit 'origin/4.5'Samuel Rødal2009-05-201-1/+2
|\ \ | |/
| * Don't draw an arrow for toolbuttons that are text only and have a menu.Norwegian Rock Cat2009-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | I made this change to make things look a bit better on the mac. However, a toolbutton with text only looks strange and as a bonus the arrow covers some of the text, which no one wants. It seems that similar consructions in Cocoa don't show the arrow for text button, so we shouldn't either. Task-number: 253339 Reviewed-by: Jens Bache-Wiig
* | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-201-152/+6
|\ \ | |/
| * qdoc: Moved a qdoc comment to a file that is in all packages.Martin Smith2009-05-201-1/+1
| | | | | | | | Task-number: 252565
| * qdoc: Moved qdoc comments from qmacstyle_mac.mm to qstyles.qdocMartin Smith2009-05-201-152/+6
| | | | | | | | | | | | | | | | | | The .mm file is not read by qdoc for packages other than for the MAC. This problem is overcome by moving the qdoc comments from the .mm file to a .qdoc file in doc/src, because all these files are read by qdoc for each of the packages. #Task-number: 252566
* | Fixed: No margin between the text and the shortcut in menu with stylesheetOlivier Goffart2009-05-181-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If padding, margin border are set on an menu item with stylesheet, no space appeared between the text and the shortcut. Fix that by adding the 12px space, same as in QCommonStyle equivalent function Note that this patch also remove unused code, since the variable with and height were not used. example to reproduce the bug: the following stylesheet on a mainwindow that contains a menu with one action with a shortcut QMenu::item { border: 1px solid red; } Task-number: 252610 Reveiwed-by: jbache
* | Graphics View Optimization: Use a simple style option by default.Bjoern Erik Nilsen2009-05-152-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStyleOptionGraphicsItem extends QStyleOption with three values: 1) matrix, 2) levelOfDetail, 3) exposedRect, and they all involve expensive QTranform operations when calculated. We pass style option(s) to drawItems() and paint(), but the extended values are usually not in use. We can therefore gain quite some nice speedup by making them opt-in with the QGraphicsItem::ItemUsesExtendedStyleOption flag. Additionally, QStyleOptionGraphicsItem::levelOfDetail has been obsoleted, and a new function QStyleOptionGraphicsItem:: levelOfDetailFromTransform(const QTransform &) has been added. Me and Andreas don't consider this change to be too controversial even though it changes the behavior. Auto tests still pass. Reviewed-by: Andreas
* | Fix QSplitter::setHandleWidth to work with motif styleJens Bache-Wiig2009-05-141-4/+0
| | | | | | | | | | | | | | | | | | | | Motif style was incorrectly adjusting it's size in sizeFromConents. This is wrong and prevents the function from overriding the huge minimum size on the widget. PM_SplitterWidth already ensures the proper default size for the splitter. Task-number: 194542 Reviewed-by: ogoffart
* | Remove snapback/maximum drag distance from QSliderJens Bache-Wiig2009-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | This feature was only intended for QScrollBar and was incorrectly inherited by QSlider. The only supported platform that use this feature seems to be Windows so instead of doing a nasty qobject cast in the styling it makes more sense to remove the functionality from QSlider entirely. Task-number: 245681 Reviewed-by: ogoffart
* | Fixes combobox menu separator on XPJens Bache-Wiig2009-05-141-1/+6
| | | | | | | | | | | | | | | | | | | | While the delegate is somewhat abusing the ToolbarSeparator here, we should make sure we draw something for small heights as well. It seems microsoft requires us to allocate a few more pixels for the separator to actually be visible. Task-number: 249192 Reviewed-by: ogoffart
* | Fix Toolbutton font with pseudo-statesOlivier Goffart2009-05-142-0/+2
| | | | | | | | | | | | | | | | | | So now QToolButton:pressed {text-decoration: underline} will works The change in QCommonStyle is to make it consistant with the setFont few lines later. Reveiwed-by: jbache
* | Remove a comment.Norwegian Rock Cat2009-05-111-1/+0
| |
* | QToolBarLayout and QDockWidgetLayout, which are private classes, areThierry Bastian2009-05-083-0/+23
| | | | | | | | | | | | | | | | | | | | no more exported designer was using QToolBarLayout members. We fixed that by using styles. Reviewed-by: Friedemann Kleint Reviewed-by: ogoffart
* | Merge branch '4.5'Thiago Macieira2009-05-071-39/+57
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| * Ensure that small and mini spin boxes are drawn correctly.Norwegian Rock Cat2009-05-071-39/+57
| | | | | | | | | | | | | | | | When we fixed the stuff for normal spin boxes, we neglected to tweak the small and mini variants. We now adjust pixels for them as well. Task-number: 252301 Reviewed-by: Jens Bache-Wiig
* | Add license header to source files that don't have one.Jason McDonald2009-05-071-0/+41
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-41/+32
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Fix crash in QWebView when application has a style sheetMarkus Goetz2009-05-061-1/+1
| | | | | | | | | | Task: 252796 Rev-By: Tor Arne
| * Revert "Fix tabbar issues with Oxygen style"Jens Bache-Wiig2009-05-051-41/+32
| | | | | | | | | | | | | | | | | | | | The patch has some issues with text eliding which are not really possible to solve properly without providing the elidemode to the styleoption. Under these circumstances it seems better just to fix the problem in Oxygen itself which has already been patched when compiled with 4.5. This reverts commit d7072b5577e3c07e984885cf05d5f9b217c6f473.
* | Fix crash in QWebView when application has a style sheetMarkus Goetz2009-05-061-1/+1
| | | | | | | | | | Task: 252796 Rev-By: Tor Arne
* | Add padding around the text in the QTabBar.Olivier Goffart2009-05-051-1/+3
| | | | | | | | | | | | | | This is only usefull when eliding text. We just make SE_TabBarTabText match to what's computed by QTabBar::tabSizeHint Reviewed-by: jbache