| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The optimization created some glitches. It now
works properly but it could be improved
performance-wise.
Task-number: QTBUG-5926
Task-number: QTBUG-5994
Reviewed-by: Morten Sorvig
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It turns out that setParent_sys is wiping out opacity for the
window regardless of what the value is from before. This patch
does the correct thing, namely look at the WA_WState_WindowOpacitySet
flag.
Task-number: QTBUG-5100
Reviewed-by: cduclos
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Window modal dialogs are shown as sheets on Mac, reusing them is showing
some painting artificats. So make sure we create a new window everytime
a sheet is shown. This only applies to Carbon, the Cocoa versions dont
have this problem.
Task-number: QTBUG-8198
Reviewed-by: MortenS
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If one opens a menu with a submenu, the submenu will be shown at a
wrong position on screen. The reason is that upon show, the top menu
will be centered on screen. But the child menu will be shown first, and
tries to center of the parent that has not yet been shown. So moving the
top menu upon show will fool the subwindow.
This patch will move the center code into the setGeometry_sys function
so that any resize on the window before it has been shown will re-center
the window correctly.
Task-number: QTBUG-2196
Reviewed-by: prasanth
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes the qmlviewer "sluggish animations and lost
mouse events" issue by making sure we don't block and
wait for for the screen refresh when flushing the
backing store to the screen.
NB: This commit fixes build issues found in f5f62c0bed.
Review: msorvig
Details:
- Don't force repaints, flush the backingstore in response
to a Cocoa paint/display events only.
- Flush once per window.
- Get the CGContext from the window (don't create a new one)
- Don't call CGContextiFlush on the context.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
See change: f842ec12706. Needed some ekstra checks for
the cocoa port as well.
Task-number: QTBUG-4227
Reviewed-by: Prasanth
(cherry picked from commit ebf9c943b789bb4ce1e1222ed17cc37bd0b1f1fe)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The crash occurs because we at one point try to assign a widget that
is marked as 'about to be deleted' to a QPointer, after clearguards
has been called. The correct fix is to avoid such an assignment in
the first place.
Task-number: QTBUG-4227
Reviewed-by: Prasanth
(cherry picked from commit f842ec12706b70f94ab5f634dc2aa025ba2cf3f2)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The example that shows this off is tools/inputpanel. This example is
strangely written, and calls activateWindow on the main window in an
activate callback to another window. So a bit recursion will happend,
and this caused troubble for the cocoa port. In addition, in Qt several
windows can be active at the same time, expecially tool windows. This
means that we need to be careful when returning early from the
becomeKeyWindow methods for NSWindow. This patch fixes up on this stuff.
Task-number: QTBUG-6002
Reviewed-by: msorvig
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
menu hiding.
The problem here was the way we entered Full Screen Mode. We were using
"kUIModeAllSuppressed" which does the following according to the manual:
kUIModeAllSuppressed
All system UI elements (including the menu bar) are hidden. However,
these elements may automatically show themselves in response to mouse
movements or other user activity.
I changed it to "kUIModeAllHidden", which does the following:
All system UI elements (including the menu bar) are hidden.
To prevent a change of behavior I added the following option to the
SetSystemUIMode:
kUIOptionAutoShowMenuBar
This flag specifies that the menu bar automatically shows itself when
the user moves the mouse into the screen area that would ordinarily be
occupied by the menu bar.
Only valid for the presentation mode kUIModeAllHidden.
Task-number: QTBUG-7625
Reviewed-by: Richard Moe Gustavsen
|
| |
| |
| |
| |
| |
| |
| |
| | |
See change: f842ec12706. Needed some ekstra checks for
the cocoa port as well.
Task-number: QTBUG-4227
Reviewed-by: Prasanth
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The crash occurs because we at one point try to assign a widget that
is marked as 'about to be deleted' to a QPointer, after clearguards
has been called. The correct fix is to avoid such an assignment in
the first place.
Task-number: QTBUG-4227
Reviewed-by: Prasanth
|
| |
| |
| |
| |
| |
| |
| | |
This have never worked in the Cocoa port, it seems. This patch gives
it a try.
Reviewed-by: msorvig
|
| |
| |
| |
| | |
Just forgot an ifdef...
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/assistant/lib/qhelpsearchquerywidget.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem here was exiting the full screen mode. In Cocoa we don't
activate windows as we do in Carbon, therefore we were not exiting from
the full screen mode. This patch adds a check when hiding a window, if
the window is in full screen mode then we go through the list of top
level windows checking if there are any other visible and not-minimized
windows that are also in full screen mode. If none if found, the we exit
the full screen mode.
Task-number: QTBUG-7312
Reviewed-by: Prasanth
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The crash happens when a QMainWindow with a native toolbar is reparented.
While re-parenting, the QToolBar triggers a new setParent() with the
MacWindowToolBarButtonHint. This messes up the internal state, hence the
crash. To avoid re-entering setParent() for the QMainWindow, this hint
is set depending on the unifiedTitleAndToolBarOnMac property.
This patch also fixes a related issue in Cocoa, we need to remove the
reused NSToolbar from the old window while recreating the QMainWindow.
Task-number: QTBUG-7162
Reviewed-by: Richard Moe Gustavsen
|
| |
| |
| |
| |
| |
| | |
Seems like this were never implemented. This patch does.
Task-number: QTBUG-7375
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
At one point in history, we decided that QDialogs should stack just
above normal windows. This patch reverts this behaviour, as cocoa
gets confused if we stack a dialog at this level without telling it
to be modal. So instead, we let cocoa set the modal window level when
we create a modal session, and also let cocoa restore the level to
what it were when the sessions ends. That way, we avoid doing the work
that cocoa is allready designed to do.
Task-number: QTBUG-5057
Reviewed-by: msorvig
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Fix warning given by cocoa
(cherry picked from commit 875afab977005b03d307040fb3be15c7524a37ff)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is because a modal flag on the window wins over the type when
determining window class. This fix will respect the type first, before
looking at the window flag.
Task-number: QTBUG-1455
Reviewed-by: Prasanth
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| |
| |
| |
| |
| |
| |
| | |
The icon was not released when destroying the window.
Task-number: QTBUG-6973
Reviewed-by: Richard Moe Gustavsen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Under some circumstances, the event dispatcher needs to stop
NSApplication, let the control return back to the QEventLoop that
called processEvents, which very often will just call processEvents
again, which in turn will restart NSApplication.
After stopping NSApplication, Cocoa seems to throw away at least some
of the posted cocoa events that are still pending. This will offcourse
have inpact on things like window updates etc. that never happends.
This patch will be more careful about when to stop NSApplication, and
delay this until the run loop has finished one more spin after interrupt
has been called. The same goes for modal sessions. Introducing this delay
also made it neccessary to sometimes block cocoa from updating the
stacking order of the windows.
Autotest: qcoreapplication, qapplication, qtimer
|
| |
| |
| |
| | |
Fix warning given by cocoa
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QPlainTextEdit can change the scroll ranges while dragging the
scrollbar. This will eventualy call QWidget::raise(), on Cocoa it was
done by removing the NSView and adding it back. This causes problems
like resetting internal state while a mouseDragged was active on the
view. The fix we will now sort the views based on their Qt-z-order.
lower() & stackUnder() also fixed like this.
Reviewed-by: Denis
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
It turns out that registering drag types for each NSView that can
receive drop events is _really_ slow. And many widget in Qt
subscribe for DnD (QTextEdit, QScrollArea, etc), so the result is
an application that will spend startup time preparing for DnD. For
some edge cases, we're talking several seconds!
This patch removes this overhead by moving drag type registering
out of NSView, and into NSWindow (that is, QCocoaWindow and
QCocoaPanel).
Task-number: QT-1586
Reviewed-by: Prasanth
|
|
|
|
|
|
|
|
|
|
|
|
| |
On Mac QWidget::destroy() sends an AcceptDropsChange event after
clearing the guards for QPointer. This was used to store a QPointer to
the widget being deleted & that will never be cleared.
The fix removed the setAcceptDrops() from destroy. And as an extra
protection make sure designer will not treat that event as interesting.
Task-number: QTCREATORBUG-307
Reviewed-by: Denis Dzyubenko
Reviewed-by: Friedemann Kleint
|
|
|
|
|
|
|
|
|
|
|
| |
We build the release packages for Carbon against the 10.4 SDK.
This means that the constants used for dealing with gestures are
missing, and currently the implementation will be ifdeffed out.
This patch defines these constants when building with an
SDK < 10.6. Gestures will therefore work when running applications
on 10.6. The same fix is also implemented for cocoa.
Rev-By: MortenS
|
|
|
|
|
|
|
|
|
| |
When we reparent a widget, it has to be removed from the old view before
it is added to the new one. Otherwise this can cause the old view to
have an invalid first responder, causing crash.
Task-number: QTBUG-5327
Reviewed-by: Denis
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/qsqlquery/tst_qsqlquery.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| | |
| | |
| | |
| | |
| | |
| | | |
The current implementation fails when moving the
widget onto an area that has just been exposed
as a part of a window resize operation.
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Do the same as on Windows - before the window is maximized save its normal
geometry so that when the window is restored we set the geometry back.
Task-number: QTBUG-4418
Reviewed-by: Prasanth
|
| |
| |
| |
| |
| |
| |
| | |
Scale the pixmap to correct size (16,16) before setting as the image for
the Document Icon button.
Reviewed-by: Denis
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
standardWindowButton:NSWindowDocumentIconButton will not return a valid
NSButton unless you call setRepresentedURL or setRepresentedFilename
for the NSWindow. This patch makes sure that setWindowIcon_sys() sets
the icon using a valid NSButton.
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Calling QWidget::setCursor() outside of the event loop causes a memory
leak in Cocoa. Adding an autorelease pool plugs it.
Merge-request: 1791
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After closing a window we used to go through the list of
kDocumentWindowClass windows to pick the next one to pop
to front. This patch will search the kMoveableWindowClass
list of windows first, and as such, pop to front any
modal window first
Rev-By: MortenS
|
| |
| |
| |
| | |
Reviewed-by: Denis Dzyubenko
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you close a modal window, then activate different app, then
activate app again, the window will pop non-modal in front.
This patch makes sure that when we hide a window, we point
to the next window to receive keyboard focus.
Rev-By: MortenS
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/formextractor/formextractor.pro
mkspecs/features/qt.prf
src/gui/painting/qpaintengineex.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
[NSWindow orderFront:] on a hidden window will make it visible. So
raise_sys() will now check if window is visible before this method is
called.
Task-number: 255428
Reviewed-by: Richard Moe Gustavsen
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
|