| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
used character operations whenever possible
better usage of QLatin1String
|
|
|
|
|
|
|
| |
Also fix an issue in QTreeView where a signal could be connected
several times
Reviewed-by: Thierry
|
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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:
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Wherever I found that we were using a string instead of a single char
I fixed the code.
Reviewed-by: olivier
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/corelib/kernel/qsharedmemory_unix.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Task-number: 252565
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
no more exported
designer was using QToolBarLayout members. We fixed that by using
styles.
Reviewed-by: Friedemann Kleint
Reviewed-by: ogoffart
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| |
| |
| |
| |
| | |
Task: 252796
Rev-By: Tor Arne
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| | |
Task: 252796
Rev-By: Tor Arne
|
| |
| |
| |
| |
| |
| |
| | |
This is only usefull when eliding text. We just make SE_TabBarTabText
match to what's computed by QTabBar::tabSizeHint
Reviewed-by: jbache
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For a progress bar with a style sheet applied to it, this
fix ensures that the timer event is passed to the event
handler that updates the busy indicator animation state.
Essentially, the bug was that the decision that the
event was processed by the proxy style object (baseStyle())
was based only on the return value from the event() function.
In this case it is necessary to check that the event was
accepted as well.
Reviewed-by: ogoffart
Reviewed-by: brad
Task-number: 252283
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QApplication::setStyle() caused a crash if called before
constructing the QApplication instance for custom styles. The reason
was that polish tried to create a pixmap (which is not allowed before
qApp is running). This fix checks that qApp exists. Polish will anyway
be called again when qApp gets constructed.
Task-number: 243697
Reviewed-by: Bjørn Erik Nilsen
|
| |
| |
| |
| |
| |
| | |
Also add another constructor to QTileRules.
Reviewed-by: Jens Bache-Wiig
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This avoids repeated instantiation of QLibrary objects in the static
QLibrary::resolve function.
s/QLibrary::resolve(GTK_PATH, 0, /libgtk.resolve(/
Reviewed-by: jbache
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These styles render using a bigger font than the one set on the
groupbox. We basically have to recalculate the minimum size to ensure
text is not clipped.
Task-number: 16483
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: 246130
Reviewed-by: joerg
Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we
decided to stick with Q_WS_WIN32, but having a separate define
makes the code more readable. In addition Q_WS_WINCE_WM is available
for Windows Mobile only parts, where we do not check for the OS on
runtime.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This makes it possible to make a custom icon for the selected tab.
We cannot use the Selected state because that has a blue tint on
many platforms which is not what you typically want int a tab. The
On state will only affect icons where these states are explicitly set.
Task-number: 202063
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| | |
(This was only working if the QLabel had a QTextControl)
Also rename the QStyleSheetStyle::focusPalette to ...::styleSheetPalette
Reviewed-by: Jens Bache-Wiig
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
we were not able to set border-image on plain QWidget,
QDialog, QMainWindow, QFrame, QMenu, and more. And for some,
not even border was working.
PE_Widget used to only draw the background, now it draws both the whole
rule (background + border)
Since menu now have a PanelMenu, let's use that insead of PE_Widget +
PE_FrameMenu. As for QFrame, we do not need to draw the border in
CE_ShapedFrame, as PE_Widget does it.
This patch mostly move code arounds.
Reviewed-by: Jens Bache-Wiig
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/global/qfeatures.h
src/gui/painting/qtransform.cpp
util/scripts/make_qfeatures_dot_h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In the GTK+ file dialog filters are only represented by names such as
"All files", while the actual extensions are hidden.
You can create a filter without a name in Qt however so in this case
we have to fall back to showing the file extensions instead.
Task-number: 251928
Reviewed-by: rosch
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This basically uses a workaround to hint to our gtk theme that we
do not want it to fill our line edit backgrouns with the background
brush. This was suggested by Benjamin berg. More information can be
found here: https://bugzilla.mozilla.org/show_bug.cgi?id=405421
Reviewed-by: Tor Arne
|
| |
| |
| |
| | |
Broken by a8d14ae567c7e847c6dbba644c36fbc6c6afc468
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Basically we try to get the toggled look correct and we've shrunk the
size of the toolbar by a good 10 pixels. We still look a bit "off" for
toggled on Tiger, but frankely that look is a bit odd.
We are a bit taller than the pure Cocoa toolbar (2 px), but given that
we are embedding our QToolbar, that's probably the best we can do.
All-in-all, it looks much better.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qaction/tst_qaction.cpp
|