diff options
| author | Gonzalo Odiard <godiard@gmail.com> | 2012-11-29 17:30:20 (GMT) |
|---|---|---|
| committer | Gonzalo Odiard <godiard@gmail.com> | 2012-11-29 17:30:20 (GMT) |
| commit | 82c19934bb82c67f95f26c6eee5722af444c6ec9 (patch) | |
| tree | 23748a272b23bda6fc4847bd12e6ace7b907ccd5 | |
| parent | b934f29d4566b57ec97c6639d1f812fb580826a8 (diff) | |
New version of scrolling patch from garnacho - olpc8 rpm version
| -rw-r--r-- | abiword-touch-scrolling.diff | 20 | ||||
| -rw-r--r-- | abiword.spec | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/abiword-touch-scrolling.diff b/abiword-touch-scrolling.diff index 035f0df..f3a4c9f 100644 --- a/abiword-touch-scrolling.diff +++ b/abiword-touch-scrolling.diff @@ -1,10 +1,13 @@ diff --git a/src/af/ev/gtk/ev_UnixMouse.cpp b/src/af/ev/gtk/ev_UnixMouse.cpp -index 2ca54ec..a9cc958 100644 +index 2ca54ec..8c1d4ed 100644 --- a/src/af/ev/gtk/ev_UnixMouse.cpp +++ b/src/af/ev/gtk/ev_UnixMouse.cpp -@@ -33,7 +33,12 @@ +@@ -32,8 +32,15 @@ + #include "xav_View.h" #include "gr_Graphics.h" ++#define RELEASE_SCROLL_TIMEOUT 800 ++ EV_UnixMouse::EV_UnixMouse(EV_EditEventMapper * pEEM) - : EV_Mouse(pEEM) + : EV_Mouse(pEEM), @@ -16,7 +19,7 @@ index 2ca54ec..a9cc958 100644 { } -@@ -45,7 +50,33 @@ void EV_UnixMouse::mouseUp(AV_View* pView, GdkEventButton* e) +@@ -45,7 +52,33 @@ void EV_UnixMouse::mouseUp(AV_View* pView, GdkEventButton* e) EV_EditMouseButton emb = 0; EV_EditMouseOp mop; EV_EditMouseContext emc = 0; @@ -51,7 +54,7 @@ index 2ca54ec..a9cc958 100644 if (e->state & GDK_SHIFT_MASK) ems |= EV_EMS_SHIFT; if (e->state & GDK_CONTROL_MASK) -@@ -103,6 +134,52 @@ void EV_UnixMouse::mouseUp(AV_View* pView, GdkEventButton* e) +@@ -103,6 +136,52 @@ void EV_UnixMouse::mouseUp(AV_View* pView, GdkEventButton* e) } } @@ -104,7 +107,7 @@ index 2ca54ec..a9cc958 100644 void EV_UnixMouse::mouseClick(AV_View* pView, GdkEventButton* e) { EV_EditMethod * pEM; -@@ -115,6 +192,36 @@ void EV_UnixMouse::mouseClick(AV_View* pView, GdkEventButton* e) +@@ -115,6 +194,37 @@ void EV_UnixMouse::mouseClick(AV_View* pView, GdkEventButton* e) device = gdk_event_get_source_device((GdkEvent *) e); @@ -130,9 +133,10 @@ index 2ca54ec..a9cc958 100644 + m_pThresholdTimer = UT_Timer::static_constructor(stopScroll, this); + } + -+ m_pThresholdTimer->set(1000); ++ m_pThresholdTimer->set(RELEASE_SCROLL_TIMEOUT); + return; -+ } ++ } else ++ m_bTouchOngoing = FALSE; + + m_iLastTouchX = (int) e->x; + m_iLastTouchY = (int) e->y; @@ -141,7 +145,7 @@ index 2ca54ec..a9cc958 100644 if (e->button == 1) emb = EV_EMB_BUTTON1; else if (e->button == 2) -@@ -195,6 +302,31 @@ void EV_UnixMouse::mouseMotion(AV_View* pView, GdkEventMotion *e) +@@ -195,6 +305,31 @@ void EV_UnixMouse::mouseMotion(AV_View* pView, GdkEventMotion *e) device = gdk_event_get_source_device((GdkEvent *) e); diff --git a/abiword.spec b/abiword.spec index fd9db4e..655d4fe 100644 --- a/abiword.spec +++ b/abiword.spec @@ -5,7 +5,7 @@ Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 1.git20121011%{?dist}.olpc7 +Release: 1.git20121011%{?dist}.olpc8 Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -105,7 +105,7 @@ cd $RPM_BUILD_DIR/abiword-20121011 # we need to update the generated configuration files because of patch104 ./autogen-common.sh autoreconf --force --install -%configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates --enable-introspection --disable-spell +%configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates --enable-introspection make %{?_smp_mflags} V=1 # build the documentation |