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

equal deleted inserted replaced

-:41300fa6a67c
+:f7bc934e204c
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 #include "qwidget_p.h"
 #include "qevent_p.h"
 #include "qdnd_p.h"
 #include <QtGui/qgraphicsproxywidget.h>
+#include "qmainwindow.h"
 QT_BEGIN_NAMESPACE
 #define XCOORD_MAX 16383
 #define WRECT_MAX 8191
 static bool qt_mac_raise_process = true;
 static OSWindowRef qt_root_win = 0;
 QWidget *mac_mouse_grabber = 0;
 QWidget *mac_keyboard_grabber = 0;
+extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 #ifndef QT_MAC_USE_COCOA
 #ifdef QT_NAMESPACE
 // produce the string "com.trolltech.qt-namespace.widget", where "namespace" is the contents of QT_NAMESPACE.
 extern bool qt_mac_app_fullscreen; //qapplication_mac.mm
 if(qt_mac_app_fullscreen == b)
 return;
 qt_mac_app_fullscreen = b;
 if (b) {
-SetSystemUIMode(kUIModeAllSuppressed, 0);
+SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
 } else {
 SetSystemUIMode(kUIModeNormal, 0);
 }
 }
 // In Qt, a popup is seen as a 'stay on top' window.
 // Since new groups are created for 'stays on top' windows, the
 // same must be done for popups. Otherwise, popups would be drawn
 // below 'stays on top' windows. Add 1 to get above pure stay-on-top windows.
 qt_mac_set_window_group(window, Qt::Popup, qt_mac_get_group_level(kOverlayWindowClass)+1);
+}
+#endif
+#ifdef QT_MAC_USE_COCOA
+void qt_mac_set_needs_display(QWidget *widget, QRegion region)
+{
+NSView *theNSView = qt_mac_nativeview_for(widget);
+if (region.isEmpty()) {
+[theNSView setNeedsDisplay:YES];
+return;
+}
+QVector<QRect> rects = region.rects();
+for (int i = 0; i<rects.count(); ++i) {
+const QRect &rect = rects.at(i);
+NSRect nsrect = NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height());
+[theNSView setNeedsDisplayInRect:nsrect];
+}
 }
 #endif
 inline static bool updateRedirectedToGraphicsProxyWidget(QWidget *widget, const QRect &rect)
 {
 widget->data->window_state = widget->data->window_state | Qt::WindowMaximized;
 QWindowStateChangeEvent e(Qt::WindowStates(widget->data->window_state
 & ~Qt::WindowMaximized));
 QApplication::sendSpontaneousEvent(widget, &e);
 }
-extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 qt_button_down = 0;
 } else if(ekind == kEventWindowCollapsed) {
 if (!widget->isMinimized()) {
 widget->data->window_state = widget->data->window_state | Qt::WindowMinimized;
 QWindowStateChangeEvent e(Qt::WindowStates(widget->data->window_state & ~Qt::WindowMinimized));
 }
 //we send a hide to be like X11/Windows
 QEvent e(QEvent::Hide);
 QApplication::sendSpontaneousEvent(widget, &e);
-extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 qt_button_down = 0;
 } else if(ekind == kEventWindowToolbarSwitchMode) {
 macSendToolbarChangeEvent(widget);
 HIToolbarRef toolbar;
 if (GetWindowToolbar(wid, &toolbar) == noErr) {
 }
 #endif
 if (widget->isVisible() && widget->updatesEnabled()) { //process the actual paint event.
 if(widget->testAttribute(Qt::WA_WState_InPaintEvent))
 qWarning("QWidget::repaint: Recursive repaint detected");
+if (widget->isWindow() && !widget->d_func()->isOpaque
+&& !widget->testAttribute(Qt::WA_MacBrushedMetal)) {
+QRect qrgnRect = qrgn.boundingRect();
+CGContextClearRect(cg, CGRectMake(qrgnRect.x(), qrgnRect.y(), qrgnRect.width(), qrgnRect.height()));
+}
 QPoint redirectionOffset(0, 0);
 QWidget *tl = widget->window();
 if (tl) {
 Qt::WindowFlags flags = tl->windowFlags();
 }
 p.end();
 if (!redirectionOffset.isNull())
 widget->d_func()->restoreRedirected();
 }
-if (widget->isWindow() && !widget->d_func()->isOpaque
-&& !widget->testAttribute(Qt::WA_MacBrushedMetal)) {
-QRect qrgnRect = qrgn.boundingRect();
-CGContextClearRect(cg, CGRectMake(qrgnRect.x(), qrgnRect.y(), qrgnRect.width(), qrgnRect.height()));
-}
 if(!HIObjectIsOfClass((HIObjectRef)hiview, kObjectQWidget))
 CallNextEventHandler(er, event);
 //send the paint
 } else if (ekind == kEventControlVisibilityChanged) {
 handled_event = false;
 if (widget) {
 qt_event_request_window_change(widget);
 if (!HIViewIsVisible(HIViewRef(widget->winId()))) {
-extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 if (widget == qt_button_down)
 qt_button_down = 0;
 }
 }
 }
 break; }
 case kEventClassMouse: {
 bool send_to_app = false;
-extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 if(qt_button_down)
 send_to_app = true;
 if(send_to_app) {
 OSStatus err = SendEventToApplication(event);
 if(err != noErr)
 QWidget member functions
 *****************************************************************************/
 void QWidgetPrivate::determineWindowClass()
 {
 Q_Q(QWidget);
+#if !defined(QT_NO_MAINWINDOW) && !defined(QT_NO_TOOLBAR)
+// Make sure that QMainWindow has the MacWindowToolBarButtonHint when the
+// unifiedTitleAndToolBarOnMac property is ON. This is to avoid reentry of
+// setParent() triggered by the QToolBar::event(QEvent::ParentChange).
+QMainWindow *mainWindow = qobject_cast<QMainWindow *>(q);
+if (mainWindow && mainWindow->unifiedTitleAndToolBarOnMac()) {
+data.window_flags |= Qt::MacWindowToolBarButtonHint;
+}
+#endif
 #ifndef QT_MAC_USE_COCOA
 // ### COCOA:Interleave these better!
 const Qt::WindowType type = q->windowType();
 Qt::WindowFlags &flags = data.window_flags;
 if (qt_mac_is_macdrawer(q)) {
 oldDrawer = qt_mac_drawer_for(q);
 }
 if (wasWindow) {
 oldToolbar = [oldWindow toolbar];
+[oldToolbar retain];
 oldToolbarVisible = [oldToolbar isVisible];
+[oldWindow setToolbar:nil];
 }
 #endif
 }
 QWidget* oldtlw = q->window();
 #else
 // Simply transfer our toolbar over. Everything should stay put, unlike in Carbon.
 if (oldToolbar && !(f & Qt::FramelessWindowHint)) {
 OSWindowRef newWindow = qt_mac_window_for(q);
 [newWindow setToolbar:oldToolbar];
+[oldToolbar release];
 [oldToolbar setVisible:oldToolbarVisible];
 }
 #endif
 }
 }
 void QWidgetPrivate::hide_sys()
 {
 Q_Q(QWidget);
 if((q->windowType() == Qt::Desktop)) //you can't hide the desktop!
 return;
 QMacCocoaAutoReleasePool pool;
 if(q->isWindow()) {
 OSWindowRef window = qt_mac_window_for(q);
 if(qt_mac_is_macsheet(q)) {
 #ifndef QT_MAC_USE_COCOA
 } else {
 #ifndef QT_MAC_USE_COCOA
 ShowHide(window, false);
 #else
 [window orderOut:window];
+// Unfortunately it is not as easy as just hiding the window, we need
+// to find out if we were in full screen mode. If we were and this is
+// the last window in full screen mode then we need to unset the full screen
+// mode. If this is not the last visible window in full screen mode then we
+// don't change the full screen mode.
+if(q->isFullScreen())
+{
+bool keepFullScreen = false;
+QWidgetList windowList = qApp->topLevelWidgets();
+int windowCount = windowList.count();
+for(int i = 0; i < windowCount; i++)
+{
+QWidget *w = windowList[i];
+// If it is the same window, we don't need to check :-)
+if(q == w)
+continue;
+// If they are not visible or if they are minimized then
+// we just ignore them.
+if(!w->isVisible() || w->isMinimized())
+continue;
+// Is it full screen?
+// Notice that if there is one window in full screen mode then we
+// cannot switch the full screen mode off, therefore we just abort.
+if(w->isFullScreen()) {
+keepFullScreen = true;
+break;
+}
+}
+// No windows in full screen mode, so let just unset that flag.
+if(!keepFullScreen)
+qt_mac_set_fullscreen_mode(false);
+}
 #endif
 toggleDrawers(false);
 #ifndef QT_MAC_USE_COCOA
 // Clear modality (because it seems something that we've always done).
 if (data.window_modality != Qt::NonModal) {
 #endif
 }
 if (!QWidget::mouseGrabber()){
 QWidget *enterWidget = QApplication::widgetAt(QCursor::pos());
+if (enterWidget && enterWidget->data->in_destructor)
+enterWidget = 0;
 QApplicationPrivate::dispatchEnterLeave(enterWidget, qt_mouseover);
 qt_mouseover = enterWidget;
 }
 qt_event_request_window_change(q);
 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)];
 }
 deltaXRect.size.width = -dx;
 deltaXRect.origin.x = scrollRect.size.width + dx;
 }
 }
+// ### Scroll the dirty regions as well, the following is not correct.
+QRegion displayRegion = r.isNull() ? dirtyOnWidget : (dirtyOnWidget & r);
+const QVector<QRect> &rects = dirtyOnWidget.rects();
+const QVector<QRect>::const_iterator end = rects.end();
+QVector<QRect>::const_iterator it = rects.begin();
+while (it != end) {
+	const QRect rect = *it;
+	const NSRect dirtyRect = NSMakeRect(rect.x() + dx, rect.y() + dy,
+		rect.width(), rect.height());
+	[view setNeedsDisplayInRect:dirtyRect];
+	++it;
+}
 NSSize deltaSize = NSMakeSize(dx, dy);
-[view translateRectsNeedingDisplayInRect:scrollRect by:deltaSize];
 [view scrollRect:scrollRect by:deltaSize];
 [view setNeedsDisplayInRect:deltaXRect];
 [view setNeedsDisplayInRect:deltaYRect];
 #endif // QT_MAC_USE_COCOA
 }
 }
 void QWidgetPrivate::deleteTLSysExtra()
 {
 #ifndef QT_MAC_USE_COCOA
-if(extra->topextra->group) {
+if (extra->topextra->group) {
 qt_mac_release_window_group(extra->topextra->group);
 extra->topextra->group = 0;
+}
+if (extra->topextra->windowIcon) {
+ReleaseIconRef(extra->topextra->windowIcon);
+extra->topextra->windowIcon = 0;
 }
 #endif
 }
 void QWidgetPrivate::updateFrameStrut()
 {
 Q_Q(QWidget);
 if (!q->testAttribute(Qt::WA_WState_Created) || !extra)
 return;
-if (extra->hasMask && extra->maskBits.size() != q->size()) {
+if (extra->hasMask) {
-extra->maskBits = QImage(q->size(), QImage::Format_Mono);
+if(extra->maskBits.size() != q->size()) {
+extra->maskBits = QImage(q->size(), QImage::Format_Mono);
+}
 extra->maskBits.fill(QColor(Qt::color1).rgba());
 extra->maskBits.setNumColors(2);
 extra->maskBits.setColor(0, QColor(Qt::color0).rgba());
 extra->maskBits.setColor(1, QColor(Qt::color1).rgba());
 QPainter painter(&extra->maskBits);

changeset 7	f7bc934e204c
parent 3	41300fa6a67c