summaryrefslogtreecommitdiffstats
path: root/src/s60main
diff options
context:
space:
mode:
authorpeknurmi <qt-info@nokia.com>2009-06-03 08:44:41 +0200
committerJason Barron <jbarron@trolltech.com>2009-06-03 08:47:34 +0200
commit3d19bb6e7572cad3644863f3f89cf67a3b7160d7 (patch)
treea815a85eac74c4b19a76cb19fb54a014eed38387 /src/s60main
parente7341afb8050cfd8bc0f5c423ff0d495b510df58 (diff)
Now qs60style does not send extra resize event in orientation change.
QSymbianControl::HandleResourceChange contained global event handling. So Qt handled same issues unnecessarily (for each shown top level widget). Now this global event handling is encapsulated to s60ResourceChange (new method) called by s60main. In addition, qs60style generated unnecessary resize events. If widget was fullscreen or maximized, then this caused incorrect resize events (old size delivered). With these changes, qs60style just informs widgets of style change (similarly as in qstylesheetstyle). Task-number: 251085 Reviewed-by: Jason Barron <jason.barron@nokia.com> Conflicts: src/gui/kernel/qapplication.h src/gui/styles/qs60style.cpp
Diffstat (limited to 'src/s60main')
-rw-r--r--src/s60main/qts60mainappui.cpp13
-rw-r--r--src/s60main/qts60mainappui.h7
2 files changed, 20 insertions, 0 deletions
diff --git a/src/s60main/qts60mainappui.cpp b/src/s60main/qts60mainappui.cpp
index 8467aef1da..f7e570ba3d 100644
--- a/src/s60main/qts60mainappui.cpp
+++ b/src/s60main/qts60mainappui.cpp
@@ -76,6 +76,19 @@ void CQtS60MainAppUi::HandleCommandL( TInt aCommand )
qApp->symbianHandleCommand(aCommand);
}
+// -----------------------------------------------------------------------------
+// CQtS60MainAppUi::HandleResourceChangeL()
+// Takes care of event handling.
+// -----------------------------------------------------------------------------
+//
+void CQtS60MainAppUi::HandleResourceChangeL(TInt aType)
+{
+ CAknAppUi::HandleResourceChangeL(aType);
+
+ if (qApp)
+ qApp->s60ResourceChangeL(aType);
+}
+
void CQtS60MainAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl *control)
{
int result = 0;
diff --git a/src/s60main/qts60mainappui.h b/src/s60main/qts60mainappui.h
index 3addb0cee9..8124fa33e2 100644
--- a/src/s60main/qts60mainappui.h
+++ b/src/s60main/qts60mainappui.h
@@ -61,6 +61,13 @@ class CQtS60MainAppUi : public CAknAppUi
void HandleCommandL( TInt aCommand );
/**
+ * From CAknAppUi, HandleResourceChangeL
+ * Handles resource change events such as layout switches in global level.
+ * @param aType event type.
+ */
+ void HandleResourceChangeL(TInt aType);
+
+ /**
* HandleStatusPaneSizeChange.
* Called by the framework when the application status pane
* size is changed.