| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
| |
Task-number: QTBUG-10512
Reviewed-by: Kim
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix for torn off menus that were way too big
Fixed an issue with pixmaps not being released correctly in the GL 1 engine.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix for torn off menus that were way too big
Fixed an issue with pixmaps not being released correctly in the GL 1 engine.
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Improved mapping of locales on symbian.
An improvement to the previous commit.
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes 005dc6c7448a724d3df496a1e528199f5a638ce0 that was pushed by mistake.
Task-number: QT-3349
Reviewed-by: trustme
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style will draw focus frame to a PushButton with any stylesheeting
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Due to incorrect braces in the if-within-if, QS60Style decided to use
QCommonStyle for styling focus frame into QPushButton when button had
*any* kind of stylesheet.
Corrected the braces.
Task-number: QTBUG-10549
Reviewed-by: Alessandro Portale
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
This is a partial backport of a fix that was pushed to 4.7
(734ba1f540aaedc4a3558268bd7350c0b15325a4)
Task-number: QT-3349
Reviewed-by: trustme
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Modified audiodevices example to list all supported formats
QS60Style: QTreeView branch indicators are drawn incorrectly in RtoL
QS60Style: Housekeeping task
QS60Style - PushButton with text and with icon should be of same size
QS60Style: When context menu is open ToolButton is not pressed down
Adding some error checking for setdefaultif
Making network reconnect happen after teardown.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QS60Style tries to rotate branch graphics around the x-axis, when
it is running in RtoL UI direction. This makes the "L-shaped" branch
indicators to point to too high at the item view item.
Branch indicators should be mirrored across the x-axis to make
them look fine.
Task-number: QTBUG-9844
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| | |
Fix whitespace, remove unneeded code, break very long lines to
two rows.
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When pushbutton contains standardIcon or non-modified text, it should
be of same size.
As a fix, style now checking default text height for icon pushbuttons
and if the icon is smaller than text height, style will make button
to match text height content.
Task-number: QT-2179
Reviewed-by: Alessandro Portale
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style prefers to use widget and calls its down() API. The value
is not true unless tool button has been set down programmatically.
Thus, we should rely on State_Sunken as well.
As a fix, style asks from both the widget and checks the state before
drawing button raised/pressed.
Task-number: QTBUG-10487
Reviewed-by: Alessandro Portale
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|