| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
4.6-staging2
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With certain themes it is really apparent that the tabshape rect and
position deduction in QS60Style has some issues. See for example
5800Xm's default theme. TabShapes have huge spaces between them.
Problem is that the initializer in style for tab shape assumes
that the side parts of the frame are squares and will use 1:1 ratio
(width:height) when upscaling the theme graphic draw area.
This leads to that tabshape graphics will not fill in the
whole area reserved for them.
When initial area has ratio of 1:2 (for horizontal tab shape),
upscaling pruduces correct rect and graphic is drawn correctly.
Task-number: QTBUG-5659
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 676780d515cedca85829ae962e4f501c5e5b6581.
Conflicts:
src/gui/painting/qblendfunctions.cpp
|
| |
| |
| |
| | |
This reverts commit d9a275b3cc4a248da1f392fb5649b9fe7a93b12c.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Due to bad first fix for QT-1478, palette is still not updated
correctly. Changed palette needs to be set back to QApplication.
Task-number: QT-1478
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added two missing qreal conversion from QS60Style.
Task-number: QTBUG-4894
Reviewed-by: Aleksandar Babic
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/painting/qblendfunctions.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We want to force use of qreal where possible. This can lead to better
performance on platforms where qreal -> float (i.e. ARM). To achieve
this we:
1. changed from 'double' to 'qreal', where justified
2. using qreal() to intialize constants, where justified
3. adding helper functions that are overloaded for qreal
like qAtan2(), qAcos(), qFabs() ...
4. defining QT_USE_MATH_H_FLOATS for Symbian platform
In addtion we used opportunity to improve code with some small things
5. converting divisions to multiplications
(i.e. '/ 2.0' -> '* qreal(0.5)')
6. defining new constants (i.e. 'Q_PI / 180.0' -> 'Q_PI180')
7. declaring variables as 'const', where justified
Reviewed-by: Andreas Aardal Hanssen
Reviewed-by: Gunnar Sletta
Reviewed-by: Jan-Arve
Reviewed-by: Kim Motoyoshi Kalland
Reviewed-by: Alessandro Portale
Reviewed-by: Janne Koskinen
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/painting/qbrush.cpp
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When using background-image and background-attachement: scroll
and background-repeat: no-repeat
The rectangle used to draw the image was not correctly computed.
Reviewed-by: Thierry
Task-number: QTBUG-3783
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When setting a gradian brush as a base for a QTreeWidget (with
stylesheet), the branch decoration would be plain black.
This is because the color() of a gradient brush is always black.
Fix it by using the base brush itself to paint the decoration if
the brush is not solid color.
Task-number: QTBUG-3816
Reviewed-by: Thierry
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| |_|/
|/| | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.0
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |/ /
| | |
| | |
| | | |
Reviewed-by: Maurice
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
dist/changes-4.6.0
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 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
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| | |/
| |/| |
|
| |\ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qevent.cpp
src/gui/kernel/qgesture.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.0
src/gui/kernel/qevent.h
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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)
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Leaving function called without a TRAP
Reviewed-by: Sami Merila
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
|\ \ \ \ \ \
| |/ / / / / |
|
| |\ \ \ \ \ |
|
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| |/ / / /
| | | | |
| | | | |
| | | | | |
Reviewed-by: TrustMe
|
| |\ \ \ \ |
|