~ubuntu-branches/ubuntu/natty/kde4libs/natty-proposed

« back to all changes in this revision

Viewing changes to plasma/private/kineticscroll.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell, Scott Kitterman, Jonathan Riddell
  • Date: 2010-11-22 17:59:02 UTC
  • mfrom: (1.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101122175902-yubxubd0pg6hn11z
Tags: 4:4.5.80a-0ubuntu1
[ Scott Kitterman ]
* New upstream beta release
  - Refreshed all patches
  - Updated debian/patches/10_make_libkdeinit4_private.diff to use Qfile
    instead of Qstring in kdecore/kernel/kstandarddirs_unix.cpp
  - Updated debian/patches/kubuntu_01_kubuntu_useragent.diff to provide
    Kubuntu in the Konqueror user agen string with the changes in
    kio/kio/kprotocolmanager.cpp
  - Partially updated debian/patches/kubuntu_05_langpack_desktop_files.diff
    and left the balance in kdecore/localization/klocale.cpp.rej for later
    revision
  - Update debian/patches/kubuntu_06_user_disk_mounting.diff for changes in
    solid/solid/backends/hal/halstorageaccess.cpp
  - Remove debian/patches/kubuntu_71_backport_plasma_webview_changes.diff
    (backported from upstream, so already present now)
  - Add minimum version for libattica-dev of 0.1.90 to build-depends
  - Bump minimum version for libsoprano-dev build-depend to 2.5.60
  - Add minimum version for shared-desktop-ontologies of 0.5 in build-dep

[ Jonathan Riddell ]
* Add build-depends on grantlee, libudev-dev, hupnp (FIXME needs packaging fixes)
* Update kubuntu_04_add_langpack_path.diff 28_find_old_kde4_html_documentation.diff
  22_hack_in_etc_kde4_in_kstandarddirs.diff for QT_NO_CAST_FROM_ASCII
* Update kubuntu_05_langpack_desktop_files.diff for new upstream code
* Add kubuntu_78_solid_trunk.diff to fix solid linking
* Add libnepomukutils4 package for new library
* Don't install kcm_ssl for now, e-mailed upstream to suggest moving to kdebase
* Add kubuntu_79_knewstuff_fix.diff to fix compile broken by non-trunk commit
  http://websvn.kde.org/?view=revision&revision=1199825
* kdelibs5-data replaces old kdebase-runtime-data due to moved file
* Add kubuntu_80_find_hupnp.diff to find hupnp include files, committed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
224
224
 
225
225
void KineticScrolling::mousePressEvent(QGraphicsSceneMouseEvent *event)
226
226
{
 
227
    Q_UNUSED(event);
 
228
 
227
229
    if (d->scrollAnimation->state() != QAbstractAnimation::Stopped) {
228
230
        d->scrollAnimation->stop();
229
231
    }
282
284
    d->kinMovement = QPointF(0,0);
283
285
 
284
286
    if((event->orientation() == Qt::Vertical) &&
285
 
       ((event->delta() < 0) && d->canScroll(KineticScrollingPrivate::Down) ||
286
 
       (event->delta() > 0) && d->canScroll(KineticScrollingPrivate::Up))) {
 
287
       (((event->delta() < 0) && d->canScroll(KineticScrollingPrivate::Down)) ||
 
288
        ((event->delta() > 0) && d->canScroll(KineticScrollingPrivate::Up)))) {
287
289
        d->kinMovement.setY(d->kinMovement.y() - event->delta());
288
290
    } else if ((event->orientation() == Qt::Vertical) ||
289
291
               (!d->canScroll(KineticScrollingPrivate::Down) &&