FCL/sf/mw/qt: comparison src/gui/kernel/qwidget

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 qWarning("QWidget: Internal error (%s:%d)", __FILE__, __LINE__);
 }
 return window;
 }
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+/* We build the release package against the 10.4 SDK.
+So, to enable gestures for applications running on
+10.6+, we define the missing constants here: */
+enum {
+kEventClassGesture              = 'gest',
+kEventGestureStarted            = 1,
+kEventGestureEnded              = 2,
+kEventGestureMagnify            = 4,
+kEventGestureSwipe              = 5,
+kEventGestureRotate             = 6,
+kEventParamRotationAmount       = 'rota',
+kEventParamSwipeDirection       = 'swip',
+kEventParamMagnificationAmount  = 'magn'
+};
+#endif
 // window events
 static EventTypeSpec window_events[] = {
 { kEventClassWindow, kEventWindowClose },
 { kEventClassWindow, kEventWindowExpanded },
 { kEventClassWindow, kEventWindowHidden },
+{ kEventClassWindow, kEventWindowZoom },
 { kEventClassWindow, kEventWindowZoomed },
 { kEventClassWindow, kEventWindowCollapsed },
 { kEventClassWindow, kEventWindowToolbarSwitchMode },
 { kEventClassWindow, kEventWindowProxyBeginDrag },
 { kEventClassWindow, kEventWindowProxyEndDrag },
 { kEventClassWindow, kEventWindowResizeCompleted },
 { kEventClassWindow, kEventWindowBoundsChanging },
 { kEventClassWindow, kEventWindowGetRegion },
 { kEventClassWindow, kEventWindowGetClickModality },
 { kEventClassWindow, kEventWindowTransitionCompleted },
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 { kEventClassGesture, kEventGestureStarted },
 { kEventClassGesture, kEventGestureEnded },
 { kEventClassGesture, kEventGestureMagnify },
 { kEventClassGesture, kEventGestureSwipe },
 { kEventClassGesture, kEventGestureRotate },
-#endif
 { kEventClassMouse, kEventMouseDown }
 };
 static EventHandlerUPP mac_win_eventUPP = 0;
 static void cleanup_win_eventUPP()
 {
 QApplication::sendSpontaneousEvent(widget, &e);
 }
 QShowEvent qse;
 QApplication::sendSpontaneousEvent(widget, &qse);
+} else if(ekind == kEventWindowZoom) {
+widget->d_func()->topData()->normalGeometry = widget->geometry();
+handled_event = false;
 } else if(ekind == kEventWindowZoomed) {
 WindowPartCode windowPart;
 GetEventParameter(event, kEventParamWindowPartCode,
 typeWindowPartCode, 0, sizeof(windowPart), 0, &windowPart);
 if(windowPart == inZoomIn && widget->isMaximized()) {
 if(send_to_app)
 return SendEventToApplication(event);
 handled_event = false;
 break; }
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 case kEventClassGesture: {
 // First, find the widget that was under
 // the mouse when the gesture happened:
 HIPoint screenLocation;
 if (GetEventParameter(event, kEventParamMouseLocation, typeHIPoint, 0,
 case kEventGestureEnded:
 qNGEvent.gestureType = QNativeGestureEvent::GestureEnd;
 break;
 case kEventGestureRotate: {
 CGFloat amount;
-if (GetEventParameter(event, kEventParamRotationAmount, typeCGFloat, 0,
+if (GetEventParameter(event, kEventParamRotationAmount, 'cgfl', 0,
 sizeof(amount), 0, &amount) != noErr) {
 handled_event = false;
 break;
 }
 qNGEvent.gestureType = QNativeGestureEvent::Rotate;
 else if (swipeDirection.y == -1)
 qNGEvent.angle = 270.0f;
 break; }
 case kEventGestureMagnify: {
 CGFloat amount;
-if (GetEventParameter(event, kEventParamMagnificationAmount, typeCGFloat, 0,
+if (GetEventParameter(event, kEventParamMagnificationAmount, 'cgfl', 0,
 sizeof(amount), 0, &amount) != noErr) {
 handled_event = false;
 break;
 }
 qNGEvent.gestureType = QNativeGestureEvent::Zoom;
 break; }
 }
 QApplication::sendSpontaneousEvent(widget, &qNGEvent);
 break; }
-#endif // gestures
 default:
 handled_event = false;
 }
 if(!handled_event) //let the event go through
 }
 if(mac_mouse_grabber == this)
 releaseMouse();
 if(mac_keyboard_grabber == this)
 releaseKeyboard();
-if(acceptDrops())
-setAcceptDrops(false);
 if(testAttribute(Qt::WA_ShowModal))          // just be sure we leave modal
 QApplicationPrivate::leaveModal(this);
 else if((windowType() == Qt::Popup))
 qApp->d_func()->closePopup(this);
 // access the window later and get a crash (becasue our
 // widget is dead). Work around this be having the drop
 // site disabled until it is part of the new hierarchy.
 bool oldRegistered = w->testAttribute(Qt::WA_DropSiteRegistered);
 w->setAttribute(Qt::WA_DropSiteRegistered, false);
+[qt_mac_nativeview_for(w) retain];
+[qt_mac_nativeview_for(w) removeFromSuperview];
 [qt_mac_nativeview_for(q) addSubview:qt_mac_nativeview_for(w)];
+[qt_mac_nativeview_for(w) release];
 w->setAttribute(Qt::WA_DropSiteRegistered, oldRegistered);
 #endif
 }
 }
 }
 #ifndef QT_MAC_USE_COCOA
 qt_mac_update_cursor();
 #else
 Q_Q(QWidget);
 if (q->testAttribute(Qt::WA_WState_Created)) {
+QMacCocoaAutoReleasePool pool;
 [qt_mac_window_for(q) invalidateCursorRectsForView:qt_mac_nativeview_for(q)];
 }
 #endif
 }
 #ifndef QT_MAC_USE_COCOA
 qt_mac_update_cursor();
 #else
 Q_Q(QWidget);
 if (q->testAttribute(Qt::WA_WState_Created)) {
+QMacCocoaAutoReleasePool pool;
 [qt_mac_window_for(q) invalidateCursorRectsForView:qt_mac_nativeview_for(q)];
 }
 #endif
 }
 if (previousIcon != 0)
 ReleaseIconRef(previousIcon);
 #else
 QMacCocoaAutoReleasePool pool;
 NSButton *iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
+if (iconButton == nil) {
+QCFString string(q->windowTitle());
+const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string);
+[qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:tmpString]];
+iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
+}
 if (icon.isNull()) {
 [iconButton setImage:nil];
 } else {
-NSImage *image = static_cast<NSImage *>(qt_mac_create_nsimage(*pm));
+QPixmap scaled = pm->scaled(QSize(16,16), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+NSImage *image = static_cast<NSImage *>(qt_mac_create_nsimage(scaled));
 [iconButton setImage:image];
 [image release];
 }
 #endif
 }
 mac_mouse_grabber->releaseMouse();
 mac_mouse_grabber=this;
 }
 }
+#ifndef QT_NO_CURSOR
 void QWidget::grabMouse(const QCursor &)
 {
 if(isVisible() && !qt_nograb()) {
 if(mac_mouse_grabber)
 mac_mouse_grabber->releaseMouse();
 mac_mouse_grabber=this;
 }
 }
+#endif
 void QWidget::releaseMouse()
 {
 if(!qt_nograb() && mac_mouse_grabber == this)
 mac_mouse_grabber = 0;
 QWidget *w = 0;
 if(q->parentWidget())
 w = q->parentWidget()->window();
 if(!w || (!w->isVisible() && !w->isMinimized())) {
 #ifndef QT_MAC_USE_COCOA
-for(WindowPtr wp = GetFrontWindowOfClass(kDocumentWindowClass, true);
+for (WindowPtr wp = GetFrontWindowOfClass(kMovableModalWindowClass, true);
-wp; wp = GetNextWindowOfClass(wp, kDocumentWindowClass, true)) {
+wp; wp = GetNextWindowOfClass(wp, kMovableModalWindowClass, true)) {
 if((w = qt_mac_find_window(wp)))
 break;
+}
+if (!w){
+for (WindowPtr wp = GetFrontWindowOfClass(kDocumentWindowClass, true);
+wp; wp = GetNextWindowOfClass(wp, kDocumentWindowClass, true)) {
+if((w = qt_mac_find_window(wp)))
+break;
+}
 }
 if (!w){
 for(WindowPtr wp = GetFrontWindowOfClass(kSimpleWindowClass, true);
 wp; wp = GetNextWindowOfClass(wp, kSimpleWindowClass, true)) {
 if((w = qt_mac_find_window(wp)))
 setGeometry(fullscreen);
 if(!qApp->desktop()->screenNumber(this))
 qt_mac_set_fullscreen_mode(true);
 } else {
 needShow = isVisible();
+if(!qApp->desktop()->screenNumber(this))
+qt_mac_set_fullscreen_mode(false);
 setParent(parentWidget(), d->topData()->savedFlags);
 setGeometry(d->topData()->normalGeometry);
-if(!qApp->desktop()->screenNumber(this))
-qt_mac_set_fullscreen_mode(false);
 d->topData()->normalGeometry.setRect(0, 0, -1, -1);
 }
 }
 d->createWinId();
 }
 // Everything should be handled by Cocoa.
 [window zoom:window];
 #endif
 needSendStateChange = oldstate == windowState(); // Zoom didn't change flags.
-} else if(oldstate & Qt::WindowMaximized) {
+} else if(oldstate & Qt::WindowMaximized && !(oldstate & Qt::WindowFullScreen)) {
 #ifndef QT_MAC_USE_COCOA
 Point idealSize;
 ZoomWindowIdeal(window, inZoomIn, &idealSize);
 #else
 [window zoom:window];
 SetKeyboardFocus(qt_mac_window_for(q), qt_mac_nativeview_for(q), 1);
 #endif
 }
 }
+NSComparisonResult compareViews2Raise(id view1, id view2, void *context)
+{
+id topView = reinterpret_cast<id>(context);
+if (view1 == topView)
+return NSOrderedDescending;
+if (view2 == topView)
+return NSOrderedAscending;
+return NSOrderedSame;
+}
 void QWidgetPrivate::raise_sys()
 {
 Q_Q(QWidget);
 if((q->windowType() == Qt::Desktop))
 return;
 #if QT_MAC_USE_COCOA
-QMacCocoaAutoReleasePool pool;
 if (isRealWindow()) {
 // Calling orderFront shows the window on Cocoa too.
 if (!q->testAttribute(Qt::WA_DontShowOnScreen) && q->isVisible()) {
 [qt_mac_window_for(q) orderFront:qt_mac_window_for(q)];
 }
 ProcessSerialNumber psn;
 GetCurrentProcess(&psn);
 SetFrontProcessWithOptions(&psn, kSetFrontProcessFrontWindowOnly);
 }
 } else {
-// Cocoa doesn't really have an idea of Z-ordering, but you can
-// fake it by changing the order of it. But beware, removing an
-// NSView will also remove it as the first responder. So we re-set
-// the first responder just in case:
 NSView *view = qt_mac_nativeview_for(q);
 NSView *parentView = [view superview];
-NSResponder *firstResponder = [[view window] firstResponder];
+[parentView sortSubviewsUsingFunction:compareViews2Raise context:reinterpret_cast<void *>(view)];
-[view removeFromSuperview];
-[parentView addSubview:view];
-[[view window] makeFirstResponder:firstResponder];
 }
 #else
 if(q->isWindow()) {
 //raise this window
 BringToFront(qt_mac_window_for(q));
 qt_event_request_window_change(q);
 }
 #endif
 }
+NSComparisonResult compareViews2Lower(id view1, id view2, void *context)
+{
+id topView = reinterpret_cast<id>(context);
+if (view1 == topView)
+return NSOrderedAscending;
+if (view2 == topView)
+return NSOrderedDescending;
+return NSOrderedSame;
+}
 void QWidgetPrivate::lower_sys()
 {
 Q_Q(QWidget);
 if((q->windowType() == Qt::Desktop))
 return;
 #ifdef QT_MAC_USE_COCOA
-QMacCocoaAutoReleasePool pool;
 if (isRealWindow()) {
 OSWindowRef window = qt_mac_window_for(q);
 [window orderBack:window];
 } else {
-// Cocoa doesn't really have an idea of Z-ordering, but you can
+NSView *view = qt_mac_nativeview_for(q);
-// fake it by changing the order of it. In this case
+NSView *parentView = [view superview];
-// we put the item at the beginning of the list, but that means
+[parentView sortSubviewsUsingFunction:compareViews2Lower context:reinterpret_cast<void *>(view)];
-// we must re-insert everything since we cannot modify the list directly.
-NSView *myview = qt_mac_nativeview_for(q);
-NSView *parentView = [myview superview];
-NSArray *tmpViews = [parentView subviews];
-NSMutableArray *subviews = [[NSMutableArray alloc] initWithCapacity:[tmpViews count]];
-[subviews addObjectsFromArray:tmpViews];
-NSResponder *firstResponder = [[myview window] firstResponder];
-// Implicit assumption that myViewIndex is included in subviews, that's why I'm not checking
-// myViewIndex.
-NSUInteger index = 0;
-NSUInteger myViewIndex = 0;
-bool foundMyView = false;
-for (NSView *subview in subviews) {
-[subview removeFromSuperview];
-if (subview == myview) {
-foundMyView = true;
-myViewIndex = index;
-}
-++index;
-}
-[parentView addSubview:myview];
-if (foundMyView)
-[subviews removeObjectAtIndex:myViewIndex];
-for (NSView *subview in subviews)
-[parentView addSubview:subview];
-[subviews release];
-[[myview window] makeFirstResponder:firstResponder];
 }
 #else
 if(q->isWindow()) {
 SendBehind(qt_mac_window_for(q), 0);
 } else if(q->parentWidget()) {
 qt_event_request_window_change(q);
 }
 #endif
 }
+NSComparisonResult compareViews2StackUnder(id view1, id view2, void *context)
+{
+const QHash<NSView *, int> &viewOrder = *reinterpret_cast<QHash<NSView *, int> *>(context);
+if (viewOrder[view1] < viewOrder[view2])
+return NSOrderedAscending;
+if (viewOrder[view1] > viewOrder[view2])
+return NSOrderedDescending;
+return NSOrderedSame;
+}
 void QWidgetPrivate::stackUnder_sys(QWidget *w)
 {
 // stackUnder
 Q_Q(QWidget);
 if(!w || q->isWindow() || (q->windowType() == Qt::Desktop))
 return;
 #ifdef QT_MAC_USE_COCOA
 // Do the same trick as lower_sys() and put this widget before the widget passed in.
-QMacCocoaAutoReleasePool pool;
+NSView *myView = qt_mac_nativeview_for(q);
-NSView *myview = qt_mac_nativeview_for(q);
 NSView *wView = qt_mac_nativeview_for(w);
-NSView *parentView = [myview superview];
-NSArray *tmpViews = [parentView subviews];
+QHash<NSView *, int> viewOrder;
-NSMutableArray *subviews = [[NSMutableArray alloc] initWithCapacity:[tmpViews count]];
+NSView *parentView = [myView superview];
-[subviews addObjectsFromArray:tmpViews];
+NSArray *subviews = [parentView subviews];
-// Implicit assumption that myViewIndex and wViewIndex is included in subviews,
+NSUInteger index = 1;
-// that's why I'm not checking myViewIndex.
+// make a hash of view->zorderindex and make sure z-value is always odd,
-NSUInteger index = 0;
+// so that when we modify the order we create a new (even) z-value which
-NSUInteger myViewIndex = 0;
+// will not interfere with others.
-NSUInteger wViewIndex = 0;
 for (NSView *subview in subviews) {
-[subview removeFromSuperview];
+viewOrder.insert(subview, index * 2);
-if (subview == myview)
-myViewIndex = index;
-else if (subview == wView)
-wViewIndex = index;
 ++index;
 }
+viewOrder[myView] = viewOrder[wView] - 1;
-index = 0;
-for (NSView *subview in subviews) {
+[parentView sortSubviewsUsingFunction:compareViews2StackUnder context:reinterpret_cast<void *>(&viewOrder)];
-if (index == myViewIndex)
-continue;
-if (index == wViewIndex)
-[parentView addSubview:myview];
-[parentView addSubview:subview];
-++index;
-}
-[subviews release];
 #else
 QWidget *p = q->parentWidget();
 if(!p || p != w->parentWidget())
 return;
 invalidateBuffer(q->rect());
 }
 /*
 Modifies the bounds for a widgets backing HIView during moves and resizes. Also updates the
 widget, either by scrolling its contents or repainting, depending on the WA_StaticContents
-and QWidgetPrivate::isOpaque flags.
+flag
 */
 static void qt_mac_update_widget_posisiton(QWidget *q, QRect oldRect, QRect newRect)
 {
 #ifndef QT_MAC_USE_COCOA
 HIRect bounds = CGRectMake(newRect.x(), newRect.y(),
 //    qDebug() << oldRect << newRect << isMove << isResize << q->testAttribute(Qt::WA_OpaquePaintEvent) << q->testAttribute(Qt::WA_StaticContents);
 QWidgetPrivate *qd = qt_widget_private(q);
 // Perform a normal (complete repaint) update in some cases:
 if (
-// move-by-scroll requires QWidgetPrivate::isOpaque set
+// always repaint on move.
-(isMove && q->testAttribute(Qt::WA_OpaquePaintEvent) == false) ||
+(isMove) ||
 // limited update on resize requires WA_StaticContents.
 (isResize && q->testAttribute(Qt::WA_StaticContents) == false) ||
 // one of the rects are invalid

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7
child 7	f7bc934e204c
child 18	2f34d5167611