| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
cases
Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adding a benchmark to compare the use of three nested linear layouts
versus the use of a single anchor layout.
We also test two different anchor layout setups to achieve the
same visual result. In the first one we use the addCornerAnchors API
that, in the way it was used, adds reduntant anchors. The second uses
the basic addAnchor API to create only the essential anchors.
Currently the first setup is way slower than the second. That happens
because the redundant anchors create "zero-sized knots" in the graph,
that are not eaten by the simplification algorithm, thus requiring
the usage of the simplex solver.
Zero-sized knots are groups of three or more vertices that are linked
together by zero-sized anchors. In pratice, these vertices represent
the same place in the graph (remember, the distance between them is
zero), but to the simplification mechanism, they look like three
distinct ones.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Some tests are expected to fail when run without simplification, ie. by
setting the environment var QT_ANCHORLAYOUT_NO_SIMPLIFICATION.
This commit adds QEXPECT_FAIL before those tests. In some cases
the failures are random therefore we must disable the test instead.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Refactor the simplifyGraphIteration() function. The aim was to make it
more clear without changing too much the way it does stuff.
Before it collected a list of candidates and then filtered that into
sublists of same order, and after that removed the center edges from
the borders. It also reversed the list if the direction wasn't
forward, to pass it in forward order to simplifySequentialChunk()
helper function.
The refactored version
- take in account the order when building the candidates, this avoids
index manipulation;
- try to calculate 'beforeSequence' and 'afterSequence' as it builds the
candidates list;
- make simplifySequentialChunk() aware of directions, now it deals internally
with reversed direction sequences.
This commits also adds explanations to trickier parts of the code.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Create calculateTrunk() and calculateNonTrunk() methods, that
calculate sizes for anchors in different parts of the simplified graph
(using simplex when needed).
Also fixes a minor leak when the nontrunk part is non-feasible. The
old code left the loop leaving the contents of 'sizeHintConstraints'
not allocated.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After calculations, update the size of all anchors in the simplified
graph. Those updates were happening locally after each calculation
(trunk and semifloats), however some anchors that were not involved in
simplex calculation were missing.
One concrete consequence of the previous behaviour is that semifloat
parts that were simplified into just one anchor, didn't have the chance
to set their sizeAt* values. One consequence of the new behaviour is
one more test passing.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change the functions solvePreferred() and solveExpanding() to take a
list of variables, so they don't need to calculate them based on the
list of constraints. That way, the trunk variables are calculated only
once.
This commit also reduce the scope of 'sizeHintConstraints' variable
instead of clearing and reusing it.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
|
|
|
|
|
|
|
|
|
| |
This is one good way to track whether simplification is doing all its
job or not. However it can only track cases where the graph simplify
to only one anchor. For more complex cases the graph dumps are the way
to go.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
|
|
|
|
|
|
|
|
| |
The graph dumper function take a name, and added debug code (that need
to be enabled manually) to generate dumps from the graph before and
after calculation. This is useful to debug simplification.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
After the addition of expanding SizePolicy, the distribution of sequential
anchors became wrong.
We must now account for three intervals of distribution instead of only two.
This commit also unifies the logic used by the sequential group anchor and
the edge interpolator.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
With four items anchored side by side, each of them being allowed
to grow to QWIDGETSIZE_MAX, we have a situation of fair distribution
because the layout itself can grow only to QWIDGETSIZE_MAX (and not
four times this amount).
This test identified an error on the expanding distribution logic.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Currently we do not support negative-sized anchors in the graph,
instead we invert such anchors and make their value positive.
We consider changing this sometime in the future but until then,
spacing must be non-negative at all times.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
|
|
|
| |
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
| |
On Cocoa, we sometimes need to block sending posted events
(because we need to flush the event que now and then without
touching Qt events). But we forgot to do same for timer callback.
So this patch makes sure that we dont send the timer event
immidiatly if we are just flushing the event que.
Rev-By: brad
|
|\ |
|
| | |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
On Symbian, QDir::rootPath() and QDir::home() are same.
RevBy: Janne Anttila
|
| |/
| |
| |
| | |
Reviewed-by: Janne Koskinen
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
This is required by the Helix plugin. As discussed with Dallas team/Fu Liz.
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Projects.pro is forcing QT_BUILD_PARTS to omit docs and translations,
but configure still outputted those into .qmake.cache. Fixed
configure to also omit them for Symbian builds to make building demos
work equally whether built by from root or not.
Task-number: QT-1018
Reviewed-by: axis
|
| | |
| | |
| | |
| | | |
Reviewed-by: axis
|
| |/
|/|
| |
| |
| |
| |
| |
| | |
Fix for applications not compiling containing #include<QtWebkit>
due to relative inclusion problem in Symbian build environment.
Task-number: QTBUG-4846
Reviewed-by: Iain
|
|/
|
|
|
|
| |
Warning: This class is provided only to get access to S60 specific
functionality in the application framework classes. It is not
portable. We strongly recommend against using it in new applications.
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The native filedialog will not exit if it is told to
hide. To remedy this, we just add an extra interrupt call
so to inform the event dispatcher that it needs to return
the the event loop to check if it has been told to quit
Rev-By: olivier
|
| | |
|
| |
| |
| |
| | |
RevBy: Janne Anttila
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
| |
It wasn't necessary to have a Symbian specific include in qprocess.h,
as 64-bit integer will work as pid also in Symbian.
Task-number: QT-2266
Reviewed-by: Janne Anttila
|
| |
|
|
|
|
|
|
|
|
| |
If the scissor is being used to clip instead of the mask, use the
bounding rectangle of the clip path if it cannot be handled as a
simple rectangle.
Reviewed-by: trustme
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Documented that pkg-config functionality must be forced if used in
conjunction with this mkspec, and that PKG_CONFIG_PATH is a shell variable
not a qmake variable.
Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Since DirectFB handles the composition for us we don't need to
invalidate anything when moving a window. Only on resize do we want
another paint event.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
We need to make sure the QDirectFBWindowSurface returns true for
isBuffered(). Otherwise QWSWindowSurface will force a repaint when
moved.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|/
|
|
|
|
|
|
| |
The EGL implementation used in S60/NGA for OpenVG does not
return a configuration with alpha masking unless it is
explicitly requested.
Reviewed-by: Julian de Bhal
|
|
|
|
|
|
|
|
|
|
| |
Scratchbox 2 abstracts away toolchain considerations when cross compiling,
allowing us to introduce a generic scratchbox 2 mkspec. See blog for more
details:
http://labs.trolltech.com/blogs/2009/09/10/cross-compiling-qtx11
Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The GLSL implementation messes up return values from functions so that
all our srcPixel()'s become black and several matrices are off. We
don't want to rewrite the shader code to fit an "ancient" graphics
card, so we simply fall back to the GL 1 engine.
Reviewed-by: Trond
(cherry picked from commit 33ed3d0bacddce214a43be60eb6481903e753a88)
|
|
|
|
| |
Reviewed-by: Jason McDonald
|
|\ |
|
| |
| |
| |
| |
| |
| | |
to zero only if currently focused
Reviewed-by: axis
|
| |
| |
| |
| | |
Rev-By: olivier
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
dd9d8693 added some checks causing SetGestureConfig to not be
initialized to 0. Thus it gets derefenced and causes crashes on all
WinCE applications.
Reviewed-by: denis
Reviewed-by: ninerider
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Notes:
- refrozen from scratch without any of the autotest exports
(To spell it out: there is no BC between anything built against these
DEF files, and anything built with previous versions of the DEF files)
- no autotest exports in this set, so no good for autotests
- it is very likely that the DEF files will be reworked again before
release, meaning that anything built against these ones won't be BC
with the 4.6.0 final release (so don't expect your apps built against
the beta to work against the final release)
- finally added a DEF file for WebKit
Reviewed-by: TrustMe
Conflicts:
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtScriptu.def
src/s60installs/eabi/phononu.def
|
| |
| |
| |
| |
| |
| |
| | |
Tweak WebCore .pro file to get its DEF file from the same location as
all the other DEF files come from
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| | |
Make sure that we cancel the pan gesture if the user starts
to press several fingers on the trackpad, and the gesture has
not yet got a chance to start
Rev-By: trustme
|
| |
| |
| |
| |
| |
| |
| | |
Earlier we returned a copy of the Qt modifiers. This patch fixes the
call to return the real native Symbian one.
RevBy: Sami Merila
|