New: styling of the pan, tap&hold and swipe recognizers

RevBy: Tomas Junnonen
Details: The gesture recognizers contained some hardcoded
values of threshold and timeout values. This patch moves these
values to style sheets. Default values are defined in MTheme.

Requires newest meegotouchtheme.

3 files changed, 62 insertions, 4 deletions

diff --git a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.cpp b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.cpp
index f5db4e75..4795cc93 100644
--- a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.cpp
+++ b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.cpp
@@ -23,6 +23,8 @@
 
 #include "mtapandholdgesture_p.h"
 
+#include <MApplication>
+
 #include <QGraphicsSceneMouseEvent>
 #include <QtTest/QtTest>
 
@@ -32,6 +34,51 @@ Qt::GestureState QGesture::state() const
     return currentGestureState;
 }
 
+//Mocking MThemePrivate, because the style object is private to library
+//and we need to compile some functionality into the unittest.
+#include "mtheme_p.h"
+void MThemePrivate::unregisterStyleContainer(MStyleContainer*)
+{
+}
+
+void MThemePrivate::registerStyleContainer(MStyleContainer *)
+{
+}
+
+void MThemePrivate::removeLeakedStyle(MStyle *)
+{
+}
+
+#include "mtheme.h"
+//Filling the values of the style object.
+static const int MTapAndHoldTimeout = 500; /* miliseconds */
+static const qreal MTapAndHoldMovementThreshold = 20; /* pixels */
+
+MTapAndHoldRecognizerStyle recognizerStyle;
+const MStyle *MTheme::style(const char *,
+                            const QString &) {
+    recognizerStyle.setTimeout(MTapAndHoldTimeout);
+    recognizerStyle.setMovementThreshold(MTapAndHoldMovementThreshold);
+    return &recognizerStyle;
+}
+
+void MTheme::releaseStyle(const MStyle *)
+{
+}
+
+MApplication *app;
+void Ut_MTapAndHoldRecognizer::initTestCase()
+{
+    static int argc = 1;
+    static char *app_name[1] = { (char *) "./ut_mtapandholdrecognizer" };
+    app = new MApplication(argc, app_name);
+}
+
+void Ut_MTapAndHoldRecognizer::cleanupTestCase()
+{
+    delete app;
+}
+
 void Ut_MTapAndHoldRecognizer::init()
 {
     recognizer = new MTapAndHoldRecognizer();
diff --git a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.h b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.h
index 8775f0c9..82d0bf66 100644
--- a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.h
+++ b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.h
@@ -33,6 +33,8 @@ private:
     MTapAndHoldRecognizer*  recognizer;
     MTapAndHoldGesture*     tapAndHoldGesture;
 private slots:
+    void initTestCase();
+    void cleanupTestCase();
     void init();
     void cleanup();
 
diff --git a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro
index 6d2d9ecd..a1705539 100644
--- a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro
+++ b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro
@@ -1,16 +1,25 @@
 include(../common_top.pri)
 INCLUDEPATH += $$MSRCDIR/corelib/events
+INCLUDEPATH += $$MSRCDIR/corelib/style
+INCLUDEPATH += $$MSRCDIR/corelib/theme
 TARGET = ut_mtapandholdrecognizer
 
+STYLE_HEADERS += \
+    $$MSRCDIR/corelib/style/mstyle.h \
+    $$MSRCDIR/corelib/style/mtapandholdrecognizerstyle.h \
+
 # unit test and unit classes
 SOURCES += \
-    ut_mtapandholdrecognizer.cpp \
-    $$MSRCDIR/corelib/events/mtapandholdrecognizer.cpp \
+    $$MSRCDIR/corelib/style/mstyle.cpp \
     $$MSRCDIR/corelib/events/mtapandholdgesture.cpp \
-    
+    $$MSRCDIR/corelib/events/mtapandholdrecognizer.cpp \
+    ut_mtapandholdrecognizer.cpp \
+
 # unit test and unit classes
 HEADERS += \
-    ut_mtapandholdrecognizer.h \
+    $$MSRCDIR/corelib/style/mstyle.h \
+    $$MSRCDIR/corelib/style/mtapandholdrecognizerstyle.h \
     $$MSRCDIR/corelib/events/mtapandholdgesture_p.h \
+    ut_mtapandholdrecognizer.h \
 
 include(../common_bot.pri)