Changeset 651 for trunk/src/gui/kernel/qapplication_s60.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qapplication_s60.cpp (modified) (21 diffs)

trunk/src/gui/kernel/qapplication_s60.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -72 +72 @@
 # endif
 # include <private/qs60mainapplication_p.h>
+
 #endif
 
@@ -808 +809 @@
 void QSymbianControl::Draw(const TRect& controlRect) const
 {
+
+
+
+
+
+
+
+
+
+
+
+
     QWindowSurface *surface = qwidget->windowSurface();
     QPaintEngine *engine = surface ? surface->paintDevice()->paintEngine() : NULL;
@@ -856 +869 @@
             Q_ASSERT(false);
         }
-    } else {
-        surface->flush(qwidget, QRegion(qt_TRect2QRect(backingStoreRect)), QPoint());
     }
 
@@ -917 +928 @@
         qwidget->data->crect = cr;
         QTLWExtra *top = qwidget->d_func()->maybeTopData();
-        if (top)
-            top->normalGeometry = cr;
+        if (top)
+            top->normalGeometry;
         if (qwidget->isVisible()) {
             QMoveEvent e(newPos, oldPos);
@@ -931 +942 @@
 void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */)
 {
-    if (m_ignoreFocusChanged)
+    if (m_ignoreFocusChanged)
         return;
 
@@ -953 +964 @@
         qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle());
 #ifdef Q_WS_S60
-        // If widget is fullscreen, hide status pane and button container
-        // otherwise show them.
+        // If widget is fullscreen/minimized, hide status pane and button container otherwise show them.
         CEikStatusPane* statusPane = S60->statusPane();
         CEikButtonGroupContainer* buttonGroup = S60->buttonGroupContainer();
-        bool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen;
-        if (statusPane && (bool)statusPane->IsVisible() == isFullscreen)
-            statusPane->MakeVisible(!isFullscreen);
-        if (buttonGroup && (bool)buttonGroup->IsVisible() == isFullscreen)
-            buttonGroup->MakeVisible(!isFullscreen);
+        ;
+        if (statusPane)
+            statusPane->MakeVisible();
+        if (buttonGroup)
+            buttonGroup->MakeVisible();
 #endif
     } else if (QApplication::activeWindow() == qwidget->window()) {
@@ -1198 +1208 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     if (touch) {
         QApplicationPrivate::navigationMode = Qt::NavigationModeNone;
@@ -1522 +1550 @@
 }
 
+
+
+
+
+
+
 /*!
     \warning This function is only available on Symbian.
@@ -1538 +1572 @@
     QScopedLoopLevelCounter counter(d->threadData);
 
+
+
+
     QWidget *w = qApp ? qApp->focusWidget() : 0;
     if (w) {
@@ -1550 +1587 @@
     switch (event->type()) {
     case QSymbianEvent::WindowServerEvent:
-        return d->symbianProcessWsEvent(event->windowServerEvent());
+        return d->symbianProcessWsEvent(event);
     case QSymbianEvent::CommandEvent:
-        return d->symbianHandleCommand(event->command());
+        return d->symbianHandleCommand(event);
     case QSymbianEvent::ResourceChangeEvent:
-        return d->symbianResourceChange(event->resourceChangeType());
+        return d->symbianResourceChange(event);
     default:
         return -1;
@@ -1560 +1597 @@
 }
 
-int QApplicationPrivate::symbianProcessWsEvent(const TWsEvent *event)
+int QApplicationPrivate::symbianProcessWsEvent(const vent)
 {
     // Qt event handling. Handle some events regardless of if the handle is in our
     // widget map or not.
+
     CCoeControl* control = reinterpret_cast<CCoeControl*>(event->Handle());
     const bool controlInMap = QWidgetPrivate::mapper && QWidgetPrivate::mapper->contains(control);
     switch (event->Type()) {
     case EEventPointerEnter:
-        if (controlInMap)
+        if (controlInMap) {
+            callSymbianEventFilters(symbianEvent);
             return 1; // Qt::Enter will be generated in HandlePointerL
+
         break;
     case EEventPointerExit:
         if (controlInMap) {
+
+
             if (S60) {
                 // mouseEvent outside our window, send leave event to last focused widget
@@ -1585 +1627 @@
         break;
     case EEventScreenDeviceChanged:
+
+
         if (S60)
             S60->updateScreenSize();
@@ -1597 +1641 @@
     case EEventWindowVisibilityChanged:
         if (controlInMap) {
+
+
             const TWsVisibilityChangedEvent *visChangedEvent = event->VisibilityChanged();
             QWidget *w = QWidgetPrivate::mapper->value(control);
@@ -1604 +1650 @@
                 delete w->d_func()->topData()->backingStore;
                 w->d_func()->topData()->backingStore = 0;
+
+
+
             } else if ((visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible)
                        && !w->d_func()->maybeBackingStore()) {
@@ -1614 +1663 @@
         break;
     case EEventFocusGained:
+
+
 #ifndef QT_NO_CURSOR
         //re-enable mouse interaction
@@ -1627 +1678 @@
         break;
     case EEventFocusLost:
+
+
 #ifndef QT_NO_CURSOR
         //disable mouse as may be moving to application that does not support it
@@ -1678 +1731 @@
   \sa s60EventFilter(), s60ProcessEvent()
 */
-int QApplicationPrivate::symbianHandleCommand(int command)
+int QApplicationPrivate::symbianHandleCommand()
 {
     Q_Q(QApplication);
     int ret = 0;
+
+
+
+
+
 
     switch (command) {
@@ -1722 +1780 @@
   KAknsMessageSkinChange are handled.
  */
-int QApplicationPrivate::symbianResourceChange(int type)
+int QApplicationPrivate::symbianResourceChange()
 {
     int ret = 0;
+
+
 
     switch (type) {
@@ -1730 +1790 @@
     case KEikDynamicLayoutVariantSwitch:
         {
+
+
         if (S60)
             S60->updateScreenSize();
@@ -1754 +1816 @@
 #ifndef QT_NO_STYLE_S60
     case KAknsMessageSkinChange:
+
+
         if (QS60Style *s60Style = qobject_cast<QS60Style*>(QApplication::style())) {
             s60Style->d_func()->handleSkinChange();