summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Compile after a72c30020bdadbe0d82e583e17acd25715604f7bBjørn Erik Nilsen2009-07-151-1/+1
| | | | | We don't translate the painter anymore (we instead set the brush origin), so we don't have to (and shouldn't) translate the rects here.
* repair the mouse cursor on Windows CEJoerg Bornemann2009-07-151-0/+4
| | | | | | | | The LoadImage function doesn't seem to work for loading cursors from resources. Also, it isn't marked as deprecated for Windows CE like on desktop Windows. So we'll just use it again. Reviewed-by: thartman
* Bad drawing of styled viewports within QAbstractScrollAreaOlivier Goffart2009-07-154-46/+35
| | | | | | | | | | | | | | | | This patch includes lots of refactoring, but the real problem was that in QWidgetPrivate::paintBackground we call drawPrimitive(PE_Widget) with a potentialy translated painter, but the opt.rect is not translated. When having a scroll area the calling function used to translated the painter and then pass the offset around to rectify. but drawPrimitive cannot rectify it. The solution is not to translate the painter but use other way to rectify the brush Task-number: 257517 Reviewed-by: bnilsen
* Make the window title set by setWindowFilePath() match our docs.Norwegian Rock Cat2009-07-142-4/+4
| | | | | | | | | | | | | | | On the mac, we were setting the absolute path of the file passed in while we document that we only set the filename. The filename is actually what all the other Mac apps do, so we should really do it. Unfortunately, this task laid around longer than it should, but the description text was bad. Additionally, fix a bug in the Cocoa version where we would set a proxy icon for items that didn't exist, this is not a good idea. Task-number: 220501 Reviewed-by: Trust Me
* use qt_mac_QStringToNString & qt_mac_NSStringToQStringNorwegian Rock Cat2009-07-141-4/+2
| | | | | | These functions hide all this horrible casting and we've had them for a while. When I see them, I try to replace them as it keeps the code much more readable.
* Build fix for mingwThierry Bastian2009-07-143-11/+10
| | | | | we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
* Compile without qt3supportOlivier Goffart2009-07-131-1/+1
|
* QToolTip: Uses QPalette::ToolTipText default text color for rich text.Thomas Sondergaard2009-07-131-0/+1
| | | | | | Task-number: 248429 Merge-request: 786 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* Merge commit 'origin/4.5'Bill King2009-07-132-6/+3
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/kbddrivers/usb/main.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qwidget/tst_qwidget.cpp
| * Fixed a crash with input methodsPierre Rossi2009-07-102-6/+3
| | | | | | | | | | | | | | | | | | The inputContext's focusWidget was not reset when disabling input methods. Thanks to Benjamin P. Task-number: 257832 Reviewed-by: Denis
* | Fix compilation on SnowLeopardNorwegian Rock Cat2009-07-102-5/+5
| | | | | | | | | | | | On 64-bit an id (void *) is 64-bit also, so, it really should be a pointer, but I'll make it a 64-bit int for the time being just so stuff compiles.
* | Tablet events get delivered to the widget where the tablet down happend.Luc Devallonne2009-07-101-2/+27
| | | | | | | | | | | | | | | | This is basically the Windows version of the bug fixed in change 82e825ed841bce324a6892fcbace03f9936d4f4f Merge-request: 855 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
* | Support Tablet coordinate on Windows with non-zero physical originLuc Devallonne2009-07-102-13/+17
| | | | | | | | | | | | | | | | | | | | Most Wacom tablet have a coordinate origin at 0 (Bamboo,Intous), but some tablet (like DTF 720, which have an integrated screen) have a non zero coordinate origin. Which lead to an errounous y/a tablet pos reported by Qt tablet event. Merge-request: 822 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
* | Ensure that when we hide QToolBar in unified, unified follows.Norwegian Rock Cat2009-07-095-18/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically if you would hide a toolbar in the unified toolbar, you would still see a little bit of area at the top instead of having everything flush with the titlebar. This change basically unsures that the unified toolbar makes a decision to hide itself if all the toolbars inside it are hidden. It makes the behavior of clicking on the toolbar button behave more or less correctly since we are going to show the unified toolbar whether we want to or not. This all will get the toolbar button switch event to be dispatched in Cocoa as well. Also add an optimization for checking if we need to change the geometry. If we don't have any items the other toolbar areas, we can skip the set geometry call, which wrecks havoc with things in Cocoa. We still don't solve the case of someone who has hidden the items with the toolbar button then goes full-screen, then goes back out. I'm not motivated to solve it as is because we need to keep track of the hides we do on the button press vs. other hides from the user and still people can workaround it easy enough by handling window state change and doing what is recommended in the docs. Task-number: 208439 Rev-by: Denis
* | Merge commit 'origin/4.5'Bill King2009-07-087-75/+82
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| * Document limitation in Cocoa cursor handling.Norwegian Rock Cat2009-07-071-0/+5
| | | | | | | | | | | | | | | | | | | | It seems there is a bug in AppKit which will automatically reset a cursor even when it is grabbed, but won't reset it when it's brought back into the window. The upshot of this is that doing a setCursor() inside of mouse handling behaves slightly different than on the other platforms (including Carbon). However, we are at the mercy of Cocoa here and I would rather have all the other things AppKit does right and live with this bug which they may fix some day.
| * Fix typo in color calculation.Norwegian Rock Cat2009-07-071-3/+3
| | | | | | | | | | | | | | | | | | Argh! It's divide by 256 not 265. The worst part was that I used the same values in Cocoa as well, so they were both "damaged." It should be good now. Task-number: 257499 Reviewed-by: Prasanth Ullattil
| * Fix issue where a mainwindow would show two size grips in Cocoa.Norwegian Rock Cat2009-07-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OK. this is a bit strange. It seems the topdata->resizer value is used to control whether or not we should show a resize handle based on a count (0 no, non-zero yes). Since we somehow decided that this value will never be larger than 15, we made it 4-bits wide. There's a "Qt/Mac" API, QWidgetPrivate::qt_mac_update_sizer(QWidget *, int = 0) which would adjust this value by the int passed in.. We use that in several places, not excluding the QStatusBar where we would pass 1 if we want to show, and -1 if we didn't. Now if you subtract -1 from zero when you are 4 bits wide, well, bad things happen. Therefore protect that (since if it's at zero we have succeeded, we don't want to show the resizer). This seems to work well. The private API is certainly an interesting way of solving the problem, but is easy to abuse (for example, this code will break if resizer = 1 and we are passed -2 in the function. Task-number: 257485 Reviewed-by: Prasanth Ullattil
| * Implement QApplication::setOverrideCursor to use pure Cocoa callsNorwegian Rock Cat2009-07-061-1/+11
| | | | | | | | | | | | | | | | | | | | | | Seems this was a victim of our cursor fixing. Cocoa does a lot for us with setting cursors. This meant that we didn't need to do as much meddling and as a result qt_mac_set_cursor does nothing in Cocoa. Unfortunately, this broke setOverrideCursor. Luckily Cocoa has a stack that works exactly like Qt, so we can just use that. Task-number: 257507 Reviewed-by: Prasanth Ullattil
| * Remove unused function viewUnderTransparentForMouseView in QCocoaView.Prasanth Ullattil2009-07-022-57/+0
| | | | | | | | | | | | | | After we implemented hitTest for QCocoaView, this function is no longer used. Reviewed-by: Norwegian Rock Cat
| * Drag and drop events are not delivered correctly in CocoaPrasanth Ullattil2009-07-022-8/+43
| | | | | | | | | | | | | | | | | | | | | | Drag and drop events should consider the WA_TransparentForMouseEvents attribute like the mouse events. If this attribute is set for a widget, the event has to be passed to right widget under mouse. The widget is identified by calling hitTest. In such cases the leave event has to be delivered to the widget which actually accepted the enter event. Task-number: 252088 Reviewed-by: Norwegian Rock Cat
| * Implement hitTestNorwegian Rock Cat2009-07-022-54/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cocoa calls hitTest on our view to determine if the view should get the mouse press. We always said, "yes" and did all the logic ourselves. Turns out that we can say "no" if I'm transparent to mouse events and remove all that code where we do all the work ourselves. Big maintenance win! For the time being I've kept the "transparentViewForEvent" method since it might be useful for others, but no one is using it at the moment and we may just kill it soon. HitTest should handle this situation correctly.
| * Fix a regression where dynamic tooltips wouldn't show up in Cocoa.Norwegian Rock Cat2009-07-022-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracking of mouse events was only enabled when enableMouseTracking or Hover or a tooltip had been set explictly on the item, but this meant that the dynamic QEvent::Tooltips would never get dispatched. So, in order to help out people that might use this feature, all QCocoaViews must pay the mouse move event tax *sigh*. I added comments in the proper places so that we DO the right thing for a release where we can force the change in behavior. Task-number: 257320 Reviewed-by: Denis
* | Cocoa: Plain text from clipboard use '\r' as newline instead of '\n'Prasanth Ullattil2009-07-083-2/+25
| | | | | | | | | | | | | | | | | | The 'public.utf16-plain-text' clipboard type maps newlines to '\r' instead of '\n'. The NSStringPboardType from NSPasteboard does this correctly, so first try to get data through this type. Task-number: 257661 Reviewed-by: Norwegian Rock Cat
* | The offset of cropRect should not depend on the position of the windowBenjamin Poulain2009-07-081-1/+1
| | | | | | | | | | The rect cropRect should be positioned with the offset to the top-level window, not the screen position.
* | On Mac OS X, translate the wrect to the coordinates on screenBenjamin Poulain2009-07-071-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the following configuration, wrect was off-screen and the widget was not painted: -scroll area "A" -contains another scrollarea "B" with 2*WRECT_MAX < size < XCOORD_MAX -the widget contained in B has size > XCOORD_MAX -A is scrolled to the the bottom To fix the issue, wrect is moved to the area where the top level window is in the widget coordinate. Task-number: 144779 Reviewed-by: nrc
* | Fixes a crash when scrolling a scrollarea with a mouse wheel.Denis Dzyubenko2009-07-071-0/+1
| | | | | | | | | | | | | | | | | | This fixes a crashed introduced in 60e965fd35037f4a27816d2aeccafdff0d6ae9d6 - those lines were removed by accident. Reviewed-by: João Abecasis Author: João Abecasis
* | Getting rid of compiler warnings on windowsThierry Bastian2009-07-072-7/+3
| |
* | doc: Included note about the effect of WA_NoMousePropagation.Martin Smith2009-07-061-0/+4
| | | | | | | | Task-number: 162945
* | Fix to paint big widgets in a scroll areaBenjamin Poulain2009-07-061-5/+3
| | | | | | | | | | | | | | | | | | | | | | If a big widget is inside a scroll area, and this widget is in the limits of XCOORD_MAX, its child might not be inside the limits. The child is then limited to wrect, but wrect might not be on the screen because the parent is scrolled. To avoid this problem, the widgets position should not influence whether wrect is used or not. Task-number: 144779 Reviewed-by: nrc
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-07-033-5/+13
|\ \
| * | Drag leave event is delivered, after re-entering the widget.Prasanth Ullattil2009-07-032-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens only for widgets with focus frames. Since the mouse location at the time of this event will be outside of the focus frame, we cannot use it to identify the widget. Instead, use the QDragManager's currentTarget() to deliver the drag leave event. Task-number: 252088 Reviewed-by: Norwegian Rock Cat
| * | Fix QX11Embed* with x86_64 by reading prop_return as long.Riku Palomäki2009-07-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the _XEMBED_INFO property uses 32 bit values, prop_return has 64-bit padded values in 64-bit applications, see man XChangeProperty. Without this fix the XEMBED client will read XEMBED_MAPPED wrong and unmap (hide) itself. Merge-request: 797 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | signals -> Q_SIGNALSVolker Hilsheimer2009-07-031-1/+1
|/ /
* | doc: Corrected several qdoc warnings.Martin Smith2009-07-031-0/+7
| |
* | Refactored gesture apiDenis Dzyubenko2009-07-0225-2531/+778
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewritten the api almost from scratch, making it simplier and more flexible at the same time. The current implementation will not have complex gseturemanager class inside Qt, but the QGesture base class, which represents both a gesture recognizer and a gesture itself with a set of properties. A set of common gestures that can use used in third-party applications (and in Qt itself internally) is supposed to be found in qstandardgestures.h, and a base class for user-defined gestures is in qgesture.h Gesture implementation for Pan on Windows7 has also been added as a reference implementation for platform gestures.
* | doc: Corrected several qdoc warnings.Martin Smith2009-07-021-2/+2
| |
* | doc: Corrected several qdoc warnings.Martin Smith2009-07-022-3/+8
| |
* | doc: Corrected several qdoc warnings.Martin Smith2009-07-021-1/+1
| |
* | Remove this stale function.Norwegian Rock Cat2009-07-011-23/+0
| |
* | Implement hitTestNorwegian Rock Cat2009-07-012-54/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cocoa calls hitTest on our view to determine if the view should get the mouse press. We always said, "yes" and did all the logic ourselves. Turns out that we can say "no" if I'm transparent to mouse events and remove all that code where we do all the work ourselves. Big maintenance win! For the time being I've kept the "transparentViewForEvent" method since it might be useful for others, but no one is using it at the moment and we may just kill it soon. HitTest should handle this situation correctly.
* | Compiler warnings.Bjørn Erik Nilsen2009-07-011-0/+2
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtNorwegian Rock Cat2009-07-0116-815/+405
|\ \
| * | src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-0115-815/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also - Make winPeekMessage() & winPostMessage() obsolete - FlashWindowEx, IsValidLanguageGroup functions no longer resolved dynamically (available on >= Windows 2000) - LoadIcon/LoadCursor -> LoadImage w/LR_SHARED for system icons/cursors - qsystemtrayicon_win: use Shell_NotifyIconGetRect if available (Windows 7) Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | doc: Fixed several qdoc error reports.Martin Smith2009-07-011-0/+16
| | | | | | | | | | | | | | | Also changed qdoc not to warn about undocumented parameters if the function is marked with the \reimp command.
* | | Never discard TabletRelease events as they may be delivered *after* ↵Cédric Luthi2009-07-011-1/+2
| | | | | | | | | | | | | | | | | | | | | TabletLeaveProximity events Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
* | | Fix tablet eventsCédric Luthi2009-07-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tablet events should set the qt_button_down, otherwise if the tablet moves onto a widget that does not accept a tablet event, it will set qt_button_down and effectively "grab" the mouse. However, we should only do this if we accept the tablet event. Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
* | | Fix a few typosCédric Luthi2009-07-011-5/+5
|/ / | | | | | | | | Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-302-3/+20
|\ \ | |/
| * Fix Toolbars in unified toolbar looking bad Carbon w/Fullscreen changesNorwegian Rock Cat2009-06-301-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in the Carbon code when an item went in full-screen, than out with a unified toolbar. In those cases the toolbars would end up getting but into the mainwindow area. The reason this was happening was that we were calling transferChildren() after we had set up our toolbar. This cause problems because we end up pulling the QToolbars right out of the unified toolbar. The easiest way to solve this is to just update the status on it again. This should solve any issues. I also added some logic to avoid calling this too many times in that one case. Luckily, this seems to only affect Carbon. Task-number: 254462 Reviewed-by: Jens Bache-Wiig