summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in license headerAlessandro Portale2009-11-125-5/+5
| | | | | | The word 'module' was missing. Reviewed-By: TrustMe
* Removed unused public Api from QS60StyleAlessandro Portale2009-11-105-83/+0
| | | | | | | | | | | | | | | QS60Style::setStyleProperty() and QS60Style::styleProperty() were intended as generic property setter/getters, but are not needed anymore. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h modified: src/gui/styles/qs60style_s60.cpp modified: src/gui/styles/qs60style_simulated.cpp modified: src/s60installs/eabi/QtGuiu.def
* Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-1/+1
|\
| * API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | Merge commit 'ceteam/4.6' into 4.6Joerg Bornemann2009-11-092-6/+19
|\ \ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| * | fixes button size for Windows mobile styleJoerg Bornemann2009-11-061-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | The old button sizes were just to big. For example the trivialwizard example had a minimal width that was much too wide for the screen. Task-number: QTBUG-3613 Reviewed-by: thartman
| * | compilefixes for qfeaturesThomas Hartmann2009-11-062-1/+10
| |/ | | | | | | Reviewed-by: Maurice
* | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-063-26/+27
|\ \ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| * | QS60Style: Harmonize theme graphic with LineEdit and QTextEditSami Merilä2009-11-053-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60 the single line and multi line editors have same theme background. We should share one as well. Now we are using fancy notepad graphic with QTextEdit, but it makes QTextEdits to look apart from QLineEdits and in some themes it is styled rather badly (as it is not a central graphic item in a theme). Therefore it is better to use one and same graphic for both widgets. Task-number: QTBUG-5259 Reviewed-by: Alessandro Portale
| * | QProgressBar is drawn stretched in QS60StyleSami Merilä2009-11-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Style draws the ends of scrollbar as too wide, causing the themegraphic to stratch which looks horrible. Task-number: QTBUG-5445 Reviewed-by: Alessandro Portale
| * | QS60Style: Checked menu check indicators are not shownSami Merilä2009-11-051-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style does not draw checked menu indicators at all. This is due to that it initializes used style option with style option's base class. Therefore relevant data for menu item indicator is not copied. Task-number: QTBUG-4717 Reviewed-by: Alessandro Portale
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-051-2/+3
| |\ \ | | |/
| * | QS60Style: QToolButton indicator will not fit into toolbutton areaSami Merilä2009-11-041-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | QToolButton rect does not include reserved area for menu indicator, so drawing the indicator makes the rest of the toolbutton area smaller. Fixed by including the menu indicator area into tool button. Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
| * | Make button margins bigger in QS60StyleSami Merilä2009-11-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenly QS60Style relies on QCommonStyle to calculate correct button content size. Unfortunately, common style does not understand frames, so it is possible that the frame-border of theme graphic gets under button content. This change makes both QPushButton and QToolButton bigger. Task-number: None Reviewed-by: Alessandro Portale
* | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-055-123/+194
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-041-2/+3
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/gui/kernel/qgesture.cpp
| | * Doc: Fixed qdoc warnings.David Boddie2009-11-041-2/+3
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-91/+92
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | * | Fix indentation.Morten Johan Sørvig2009-10-301-89/+89
| | | |
| | * | Fix issue with wrong QMessagebox icons on Mac.Morten Johan Sørvig2009-10-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-4988 68c0e6a8ba1e92bf0152adcaa86eebb83dcfd1d8 introduced a regression preventing the mac-spesific standardIcon code form being called. Call the Mac code if desktopSettingsAware is set. (QIcon::themeName() is only set on X11)
| * | | Merge branch '4.6-s60' into 4.6axis2009-11-043-30/+99
| |\ \ \
| | * | | Fix for potential crash in S60 styleShane Kearns2009-11-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leaving function called without a TRAP Reviewed-by: Sami Merila
| | * | | QS60Style: impossible to open menu from styled QToolButtonSami Merilä2009-11-031-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style ignores toolButton's menu indicator rect. This means that the button's menu cannot be triggered by the user, as the style does not draw the indicator at all. With this fix, style calculates a rect (including margins) for menu indicator and draws that (arrow down) into toolButton (by making the button bevel larger). Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0312-93/+249
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Build break fix for S60Simulated styleSami Merilä2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60Simulated style broke down after change SHA da9880eaed0d09338717db1a73db01e6b0ab080d, because part()-method call in simulated style was not updated to have additional parameter. Task-number: None Reviewed-by: Shane Kearns
| | * | | QS60Style - TabWidget text changes color when widget becomes dimmedSami Merilä2009-11-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style sets the tabWidget palette hash only for QPalette::Active. So, when widget becomes disabled, text color changes back to default. Task-number: QTBUG-4625 Reviewed-by: Alessandro Portale
| | * | | Style's theme palette hash is lost after orientation switchSami Merilä2009-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, after orientation switch when new theme background is applied, it is done using QApplication::setPalette(). This unfortunately tosses away the palette hash. So instead directly calling QApplication::setPalette(), the fix is to call the style's internal setThemePalette(), which copies the hash also to QApplication palette. This is related to bug QT-1478 in Private JIRA. Task-number: QT-1478 Reviewed-by: Shane Kearns
| | * | | S60Style: User set header view palettes are ignoredSami Merilä2009-10-301-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style ignores user defined palettes for QHeaderViews. With this fix, style takes palette changes into account and also draws QTableCornerButton correctly. Task-number: QTBUG-4522 Reviewed-by: Alessandro Portale
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-10-301-3/+0
| | |\ \ \
| | * | | | S60Style: List items should be taller for touch use (5th Edition)Sami Merilä2009-10-301-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes private JIRA issue: QT-1479. The change makes itemview items taller by twice the QStyle::PM_FocusFrameVMargin amount (both margins) when touch is in use. It is rather curious that the QCommonStyle modifies QRect for itemviews in horizontal direction by twice the QStyle::PM_FocusFrameHMargin amount, but does not do it in vertical direction. Task-number: QT-1479 (private) Reviewed-by: Alessandro Portale
* | | | | | Stylesheet: Fix lineedit size with an empty stylesheet with some stylesOlivier Goffart2009-11-051-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now passes tst_QStyleSheetStyle::emptyStyleSheet with gtk style Somehow there were some wrong and uneeded default padding for the QLineEdit with some styles Task-number: QTBUG-5434 Reviewed-by: axis
* | | | | | Wrong styling of checkable menu items.Gabriel de Dietrich2009-11-043-21/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using style sheets, the fallback for the menu item is QWindowsStyle. However, QWindowsStyle doesn't draw anything when the item is not checked. We now mimick what QWindowsStyle would draw in QStyleSheetStyle::drawControl(). The "static const int windows*" variables in qwindowsstyle.cpp have been moved into QWindowsStylePrivate to make them accessible to QStyleSheetStyle. Reviewed-by: Olivier Task-number: QTBUG-2218 Task-number: QTBUG-2217 Task-number: QTBUG-3479
* | | | | | Fixes StyleSheets: Incorrect display of custom style to QComboBoxOlivier Goffart2009-11-042-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two problem: - When QWindowsStyle draw CC_ComboBox, it does not save/restor the painter, whilt it does modify the pen and the brush. - QStyleSheetStyle CE_ComboBoxLabel did not specify the palette role to paint the text with, leaving the one from the palette Task-number: QTBUG-3974 Reviewed-by: Gabriel
* | | | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0412-1335/+1442
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-049-1331/+1437
| |\ \ \ \ \
| | * | | | | QGtkStyle refactoringRobert Griebl2009-11-039-1331/+1437
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
| * | | | | Compile...Gunnar Sletta2009-11-031-2/+2
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Merge commit 'origin/4.6' into featureJørgen Lind2009-11-0215-236/+422
| |\ \ \ \
| * | | | | Fix QT_NO_GROUPBOXJørgen Lind2009-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| * | | | | Fix QT_NO_IMAGEFORMAT_PNGJørgen Lind2009-10-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
* | | | | | QStyleSheetStyle: CE_PushButton Do not call the parent style if we have ↵Olivier Goffart2009-11-031-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nothing to draw This fixes the focus rect that appears on buttons with GtkStyle if a stylesheet is used. Task-number: QTBUG-4488 Reviewed-by: Gabriel
* | | | | | QStyleSheetStyle: ItemViews: Fixes drawing of items and branches.Olivier Goffart2009-11-021-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am not sure why the code was there, but after some testing, it is better to remove it: - While painting the branch, we should not look at the ::item pseudo class at all. - Items specific stuff is drawn in PE_PanelItemViewItem, not PE_PanelItemViewRow - Selection is handled his way by the native style. background-color is not for selection and should not depends on SH_ItemView_ShowDecorationSelected Reviewed-by: Thierry Task-number: QTBUG-5228 Task-number: 258382 Task-number: QTBUG-4338
* | | | | | Merge origin/4.6 into team-widgets/4.6Olivier Goffart2009-11-027-47/+208
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-307-47/+208
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fix tab widget painting in QGtkStyle with reverseJens Bache-Wiig2009-10-085-26/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds QStyleOptionTabWidgetFrameV2 so that we do not have to do ugly hacks in the style to obtain it. Task-number: QTBUG-5187 Reviewed-by: ogoffart
| | * | | | Tabs with corner widgets are drawn incorrectly in document mode on Mac.Prasanth Ullattil2009-10-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While drawing the tabbar frame, mac style needs the QTabBar pointer to calculate the correct size. Since the QTabWidget also uses the PE_FrameTabBarBase to draw background of the corner widgets, the mac style has to use position passed with the style option. This only works with horizontal tabs. Reviewed-by: Jens Bache-Wiig
| | * | | | Fix a combobox autotest on VistaJens Bache-Wiig2009-10-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subcontrol rect offset was correctly reporting not to work on Vista style. The problem was that we were getting the size of the arrow by subtracting the xoffset. But this would mean that the Reviewed-by: ogoffart
| | * | | | Fix split tool button drawing on Vista when not in a tool barJens Bache-Wiig2009-10-071-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a tool button is not in a tool bar on XP and Vista it will get a slightly different appearance from normal tool buttons. I resolved this by drawing a normal tool button with a divider line on top if the autoraise property is not set on the button. (which is by default enabled only for buttons in a tool bar). Task-number: QTBUG-5061 Reviewed-by: prasanth
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into ↵Bradley T. Hughes2009-10-282-4/+10
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | 4.6-WM_NULL-driven
| | | * | | Selected tab is drawn incorrectly on Snow Leopard.Prasanth Ullattil2009-10-271-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default height of tab bar is 22 pixels in Snow Leopard. We used to draw tabs taller than 21 pixels to a pixmap and stretch to the required size. The limit is now changed to 22 pixels (which is the most common use case). The stretched drawing is not perfect in Snow Leopard due to some changes in how HITheme draws tabs. Reviewed-by: Jens Bache-Wiig
generated by cgit v0.12 at 2024-12-06 17:22:58 (GMT)