| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
| |
The desktop Windows and Windows CE code paths diverged too much.
Splitting it up now and making it work on WinCE again.
Task-number: QTBUG-4828
Reviewed-by: mauricek
|
| |
|
|
|
|
|
|
|
| |
Adding the same menu action object to n menu bars resulted in n
QAction::triggered() signals. Now, we're comparing the active window
with the parent HWND of the menu bar before triggering.
Task-number: QTBUG-10402
Reviewed-by: thartman
|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed line and point drawing for the PS/PDF generators.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Some lines and points could appear with artifacts when printed or
viewed in a pdf viewer. If a brush was set we also generated a fill
for the line/point, which was not correct.
Task-number: QTBUG-8451
Reviewed-by: Gunnar
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: Sliders are too small
QLineEdit / QDateEdit - white font on white background
Corrected headers for spectrum analyzer demo
QS60Style: QCalendarWidget draws only one-digit dates
Add spectrum analyzer demo app
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Sometime back slider graphic in the QS60Style was changed to use the
"new" slider graphic available in 5th Edition and newer SDKs (the
old SDKs still use the slider graphic). However, at that time nobody
noticed that the new slider has different size than the old one in the
Nokia LAF document.
To fix the sliders, updated the pixel metrics calculation rules to
use the new slider LAF data. Also fixed a grpahic start and end
part rounding to match native look.
Task-number: QTBUG-10454
Reviewed-by: Alessandro Portale
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently QCoeFepInputContext uses default QLineEdit palette when
setting up text format before passing the formatted text to native
side (which uses it, for example, to show T9 suggested words).
The above way is incorrect due to two reasons:
- custom widget might not be anything like QLineEdit and might have
really different palette from it
- it ignores stylesheets (or modifications to the QLineEdit's palette)
Therefore, the color for text format is picked up from focusWidget,
if it is available (in most cases it should be). If the focusWidget
is not available, then QLineEdit default palette is used.
Task-number: QTBUG-9480
Reviewed-by: Janne Koskinen
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QCalendarWidget draws only one-digit dates
Add spectrum analyzer demo app
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QCalendarWidget draws only one-digit dates
Add spectrum analyzer demo app
|
| | | | |\ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Due to largish pixel metrics values for text margins, content does not
fit into QCalendarWidget date-cells.
To fix this, the failing pixel metric values are halved for
QTableViews and its derivatives. This matches native margins almost
perfectly (depending on native layout 1-2 pixel offset).
Task-number: QTBUG-10417
Reviewed-by: Alessandro Portale
|
| |\ \ \ \ \ |
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The geometry was not properly set because QGraphicsWidget rely on itemChange
to update its own geometry. Now when calling setPos we also ensure that
for a widget the geometry will be up to date. Setting the flag
ItemSendsPositionChanges to false for a given widget will give a small
performance boost.
Reviewed-by:janarve
Reviewed-by:bnilsen
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When going through the special WebKit code path for text drawing and
forcing justification for text, we would set the justification in the
text engine, but never actually update the widths of the script items.
Since the width of the script item is used to position the text, the
text would be drawn with the correct justification, but the position
would be set based on the non-justified text width. The result was
overlapping text whenever the script of the text changed. The fix goes
through the justified glyphs and sets the width and position based on the
new effective advance.
Task-number: QTBUG-10421
Reviewed-by: Simon Hausmann
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-7364
Reviewed-by: thartman
|
| |/ / /
| | |
| | |
| | | |
Task-number: QTBUG-8393
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
WinCE: QMenuBar::triggered(QAction*) was emitted too often
coding style changes in qmenu_wince.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Calling QMenuPrivate::activateAction instead of QAction::activate makes
use of the internal recursion guard and fixes this problem.
Also emitting QMenuBar::triggered in the command-in-menu-bar case will
QAction::activate do for us.
Task-number: QTBUG-10358
Reviewed-by: thartman
|
| | |/ |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix combobox backgroundrole not respected in some styles
Allow QtDBus to be compiled as a static library on Windows.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The issue was a regression in 4.5 since we introduced styling.
We now set the background role as the menuoption palette
when available.
Reviewed-by: ogoffart
Task-number: QTBUG-10403
|
| |/
|
|
|
|
|
|
|
|
|
| |
QS60Style did check if the tab icon size was larger than pixel metric
for default tab icon size. If it was, then it reset the icon size to
match pixel metric. It was impossible to set large icon to tab widget.
As a fix, this check was removed from style.
Task-number: QTBUG-3102
Reviewed-by: Jason Barron
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
QComboBoxPrivateScroller calls eraserects for menu scroller areas,
expecting the style to fill the gaps. Unfortunately, the QS60Style
does not draw menu scrollers at all
(but they are functional when interacted with).
Therefore, these areas are now drawn as holes.
As a fix, the eraseRect call from provate class
QComboBoxPrivateScroller is removed when "s60 flag" is defined.
Task-number: QTBUG-10371
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Normally Qt uses scrollbuttons together at right (for LeftToRight UI)
side of the horizontal QTabBar; for vertical tab bar, scrollbuttons are
displayed below/above the widget.
Using QTabBar's scroll buttons with touch device that has capacitive
screen, is somewhat hard as the touch area for either of the scroll
buttons is somewhat smallish. So user is experiencing frequent wrong
taps. Making the touch area larger, would make the tabbar tab shape
area smaller, so it isn't a very good solution.
Therefore, when QS60Style is in use, QTabWidget draws the scrollbuttons
on either side of the QTabBar.
Task-number: QT-3104
Reviewed-by: Alessandro Portale
|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix bold text rendering of Thai and Vietnamese on Symbian
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Symbian Qt font database made the wrong assumption that a font face
name maps one to one to a font. That led to a mismaptch between actual
font face variants (bold) versus the retrieved font tables.
S60, usually comes with two 'Series 60 Sans' font files where one is
semi bold. The rasterizer plugin merges both fonts to one and returns
the semi bold font if a bold font is requested, otherwise it returns
the normal font. Both font files have slight differences in the cmap.
Qt's font implementation always retrieved the font tables for the
normal font even if it drew the bold font. That led to wrong glyphs
in some languages (Thai, Vietnamese), thanks to the cmap differences.
This fix makes sure that when retrieving the font tables, bold and
italic are considered. It avoids innecessary double allocations of
MOpenFontTrueTypeExtension instances. Also the ChunkHeap size of
m_heap does now depend on the number of loaded font files.
Task-number: QTBUG-6812
Reviewed-by: Aleksandar Sasha Babic
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed a leak in QTextDocument::print().
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
|
| | |
| |
| |
| |
| |
| |
| | |
Also fixed a typo in the QScopedPointer docs.
Task-number: QTBUG-10301
Reviewed-by: Kim
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When focusInEvent is called we need to ensure that WA_InputMethodEnabled
is set, since FocusInEvent might lead to that
QInputContext::setFocusWidget is called (with the QGraphicsView as the
widget parameter).
However, if the widget still does not have WA_InputMethodEnabled set
yet it will assert in QInputContext::setFocusWidget (it requires that
the widget has the flag set).
This was a problem for the morbit bridge, where Dui requires the
attribute to be set (while Orbit actually does not require)
Task-number: QTBUG-10276
Reviewed-by: jasplin
Reviewed-by: Alexis Menard
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
MOpenFontShapingExtension was not used. Cleaning up and reducing delta
between branches
Reviewed-by: Aleksandar Sasha Babic
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The default values for QCoeFepInputContext are set so that lower
('ab') and upper cases ('AB') are supported. Without any input method
hints, input mode widgets cannot get into text mode ('Ab') at all.
Changed the implementation so that default value is 'Text' like
in native S60 devices.
Task-number: QTBUG-10006
Reviewed-by: Janne Koskinen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The 'iPosition' that we receive from the TAdvancedPointerEvent is
relative to the origin of the window that received the event, not the
screen so it needs to mapped to be correct.
Reviewed-by: Bradley T. Hughes
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
Symbian uses buffer of CEikMenuPaneItem::SData::ENominalTextLength
characters for menu item texts, so truncate any text that is longer
than that.
Task-number: QTBUG-10207
Reviewed-by: Janne Anttila
|
| | |
| |
| |
| |
| |
| |
| |
| | |
That reduces the delta between 4.6/4.7 and a patch that I am pre-
paring for Symbian^4. The renaming will help me a lot when main-
taining font issues on 4.6 and 4.7 and different Symbian versions.
Reviewed-by: trustme
|
| |/
|
|
|
|
|
|
|
|
|
|
|
| |
The CEikCba class casting is not binary compatible between at least
S60 3.2 and 5.0 platforms, even though it is source compatible.
The removed code was causing stack corruption on emulator
when binaries were built on S60 3.2 SDK and run on S60 5.0 SDK.
Another solution for this feature needs to be found.
Task-number: QTBUG-10199
Reviewed-by: Shane Kearns
Reviewed-by: Janne Anttila
|
| |
|
|
|
|
|
|
|
| |
Only the QFontCache object for the main thread was cleared when the
the application exited, or a thread was destroyed. This caused font
engine references to hang around and never get deleted.
Task-number: QTBUG-3976
Reviewed-by: Brad
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Currently, QS60Style does not draw menu separators at all, yet they
are calculated to take screen estate. Remove the screen reservation
from them.
See also QTBUG-10054 for details to add menu separator support to
style.
Task-number: QTBUG-10191
Reviewed-by: Alessandro Portale
|
| |\ |
|
| | |
| |
| |
| | |
Reviewed-by: Jason Barron
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
stub implementations for EGL for symbian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is done to keep binary compatibility between Qt built with openvg
vs Qt built without openvg support.
The problem is that Symbian uses .def files to map between exported
symbol names and ordinals in the DLL export table. The alternative of
manually maintaining two versions of the QtGui def files proved to be
too error prone and time consuming.
Note that the EGL exports are defined in a private header, for use by
the openvg and opengl graphics system plugins.
These plugins should always be compiled against Qt configured with
support for the graphics system, as the headers contain default parameters
which are inlined into the plugin binary.
Task-number: QTBUG-7870
Reviewed-by: Tom Cooksey
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1. The Adobe EPSF 3.0 spec requires that the PS version of EPS files is
PS-Adobe-3.0.
2. The %%BoundingBox operator is documented to use integers, we used
to output floating point numbers when generating an EPS file.
Task-number: QTBUG-10121, QTBUG-10140
Reviewed-by: Kim
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was another regression in QLineEdit introduced with the move to QLineControl
setCursorPosition clear the selection, and setSelection move the cursor position.
So the case where we want the position at the beginning of the selection need
to be handled separately (by doing the selection reverse)
This does not cover the case where the position is in the middle, or outside
the selection, but it is not possible to do.
Task-number: QTBUG-10019
Reviewed-by: jbache
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Due to recent change in QS60Style where combobox menu was changed to
popup menu, instead of dropdown menu, long QMenus now work sloppily.
This is due to that pixel metric PE_MenuScrollerHeight was set to zero
to avoid "non-drawn" areas in combobox popups. Of course, QMenu
scrolling really needs the scrolling area if it is to make any
scrolling.
As a solution, scroller height is now zero for combobox popup and
in QMenu it is the height of itemview item (for "standard" content),
but no any scroller indication is drawn. The menu scrolls automatically
when bottom/top part of menu list is highlighted.
Task-number: QTBUG-10073
Reviewed-by: Janne Koskinen
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On every change of the base style it is inserted into styleSheetCache.
If the base style gets destroyed, it must be removed from the cache.
Task-number: QTBUG-4074
Reviewed-by: ogoffart
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: lars
|
