commit kdelibs3

19 May 2006

Hello community,

here is the log from the commit of package kdelibs3
checked in at Fri May 19 16:50:50 CEST 2006.

--------

--- KDE/kdelibs3/kdelibs3.changes	2006-05-18 10:36:29.000000000 +0200
+++ kdelibs3/kdelibs3.changes	2006-05-19 10:57:13.000000000 +0200
@@ -1,0 +2,5 @@
+Fri May 19 10:57:01 CEST 2006 - stbinner@suse.de
+
+- make khtml smooth scrolling acceptable (#175741)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdelibs3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.yE3jS4/_old	2006-05-19 16:49:42.000000000 +0200
+++ /var/tmp/diff_new_pack.yE3jS4/_new	2006-05-19 16:49:42.000000000 +0200
@@ -18,7 +18,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Additional Package Documentation
 Version:        3.5.2
-Release:        5
+Release:        6
 %define       kdelibs_patch_level b
 BuildArch:    noarch
 Requires:       kdelibs3 qt3-devel-doc

++++++ kdelibs3.spec ++++++
--- /var/tmp/diff_new_pack.yE3jS4/_old	2006-05-19 16:49:42.000000000 +0200
+++ /var/tmp/diff_new_pack.yE3jS4/_new	2006-05-19 16:49:42.000000000 +0200
@@ -18,7 +18,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        KDE Base Libraries
 Version:        3.5.2
-Release:        5
+Release:        6
 %define       kdelibs_patch_level a
 Obsoletes:      kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons
 Provides:       kups keramik kdelibs3-cups kdelibs3-33addons
@@ -723,6 +723,8 @@
 /opt/kde3/%_lib/libkwalletclient.so
 
 %changelog -n kdelibs3
+* Fri May 19 2006 - stbinner@suse.de
+- make khtml smooth scrolling acceptable (#175741)
 * Wed May 17 2006 - dmueller@suse.de
 - fix kerberos handling in kprinter (#154334)
 * Mon May 15 2006 - stbinner@suse.de

++++++ testkhtml.spec ++++++
--- /var/tmp/diff_new_pack.yE3jS4/_old	2006-05-19 16:49:42.000000000 +0200
+++ /var/tmp/diff_new_pack.yE3jS4/_new	2006-05-19 16:49:42.000000000 +0200
@@ -16,7 +16,7 @@
 License:        Other License(s), see package, BSD
 Group:          System/GUI/KDE
 Version:        3.5.2
-Release:        5
+Release:        6
 Summary:        Internal: regression testing for konqueror renderer
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        kdelibs-%{version}.tar.bz2







++++++ smooth-scrolling.diff ++++++
--- /var/tmp/diff_new_pack.yE3jS4/_old	2006-05-19 16:49:44.000000000 +0200
+++ /var/tmp/diff_new_pack.yE3jS4/_new	2006-05-19 16:49:44.000000000 +0200
@@ -1,8 +1,6 @@
-Index: khtml/khtmlview.cpp
-===================================================================
---- khtml/khtmlview.cpp.orig
-+++ khtml/khtmlview.cpp
-@@ -147,6 +147,9 @@ public:
+--- khtml/khtmlview.cpp.sav	2006-05-18 19:13:56.000000000 +0200
++++ khtml/khtmlview.cpp	2006-05-18 19:41:19.000000000 +0200
+@@ -150,6 +150,9 @@ public:
  
      KHTMLViewPrivate()
          : underMouse( 0 ), underMouseNonShared( 0 ), visibleWidgets( 107 )
@@ -12,7 +10,7 @@
      {
  #ifndef KHTML_NO_CARET
  	m_caretViewContext = 0;
-@@ -392,6 +395,17 @@ public:
+@@ -395,6 +398,17 @@ public:
      int m_mouseScroll_byY : 4;
      QTimer *m_mouseScrollTimer;
      QWidget *m_mouseScrollIndicator;
@@ -30,7 +28,7 @@
  };
  
  #ifndef QT_NO_TOOLTIP
-@@ -500,6 +514,11 @@ KHTMLView::KHTMLView( KHTMLPart *part, Q
+@@ -503,6 +517,11 @@ KHTMLView::KHTMLView( KHTMLPart *part, Q
      init();
  
      viewport()->show();
@@ -42,7 +40,43 @@
  }
  
  KHTMLView::~KHTMLView()
-@@ -1673,8 +1692,16 @@ void KHTMLView::keyReleaseEvent(QKeyEven
+@@ -1512,7 +1531,7 @@ void KHTMLView::keyPressEvent( QKeyEvent
+                 _ke->accept();
+             else {
+                 if (!d->scrollTimerId || d->scrollSuspended)
+-                    scrollBy( 0, 10 );
++                    scrollBy( 0, 10 * _ke->count());
+                 if (d->scrollTimerId)
+                     d->newScrollTimer(this, 0);
+             }
+@@ -1535,7 +1554,7 @@ void KHTMLView::keyPressEvent( QKeyEvent
+                 _ke->accept();
+             else {
+                 if (!d->scrollTimerId || d->scrollSuspended)
+-                    scrollBy( 0, -10 );
++                    scrollBy( 0, -10 * _ke->count());
+                 if (d->scrollTimerId)
+                     d->newScrollTimer(this, 0);
+             }
+@@ -1556,7 +1575,7 @@ void KHTMLView::keyPressEvent( QKeyEvent
+                 _ke->accept();
+             else {
+                 if (!d->scrollTimerId || d->scrollSuspended)
+-                    scrollBy( 10, 0 );
++                    scrollBy( 10 * _ke->count(), 0 );
+                 if (d->scrollTimerId)
+                     d->newScrollTimer(this, 0);
+             }
+@@ -1567,7 +1586,7 @@ void KHTMLView::keyPressEvent( QKeyEvent
+                 _ke->accept();
+             else {
+                 if (!d->scrollTimerId || d->scrollSuspended)
+-                    scrollBy( -10, 0 );
++                    scrollBy( -10 * _ke->count(), 0 );
+                 if (d->scrollTimerId)
+                     d->newScrollTimer(this, 0);
+             }
+@@ -1709,8 +1728,16 @@ void KHTMLView::keyReleaseEvent(QKeyEven
          d->scrollSuspendPreActivate = false;
      if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == Qt::ShiftButton
          && !(KApplication::keyboardMouseState() & Qt::ShiftButton))
@@ -58,9 +92,9 @@
 +        }
 +    }
  
-     // Send keyup event
-     if ( dispatchKeyEvent( _ke ) )
-@@ -3148,7 +3175,11 @@ void KHTMLView::viewportWheelEvent(QWhee
+     if (d->accessKeysEnabled) 
+     {
+@@ -3249,7 +3276,11 @@ void KHTMLView::viewportWheelEvent(QWhee
      else
      {
          d->scrollBarMoved = true;
@@ -72,7 +106,7 @@
  
          QMouseEvent *tempEvent = new QMouseEvent( QEvent::MouseMove, QPoint(-1,-1), QPoint(-1,-1), Qt::NoButton, e->state() );
          emit viewportMouseMoveEvent ( tempEvent );
-@@ -4342,4 +4373,112 @@ void KHTMLView::moveCaretToLineEnd()
+@@ -4448,4 +4479,117 @@ void KHTMLView::moveCaretToLineEnd()
  
  #endif // KHTML_NO_CARET
  
@@ -147,7 +181,12 @@
 +    d->dy -= ddy;
 +
 +//    QScrollView::setContentsPos( contentsX() + ddx, contentsY() + ddy);
++    kapp->syncX();
 +    QScrollView::scrollBy(ddx, ddy);
++// Unaccelerated X can get seriously overloaded by scrolling and for some reason
++// will send KeyPress events only infrequently. This should help to reduce
++// the load.
++    kapp->syncX();
 +}
 +
 +void KHTMLView::startScrolling()
@@ -185,11 +224,9 @@
 +#endif // NO_SMOOTH_SCROLL_HACK
 +
  #undef DEBUG_CARETMODE
-Index: khtml/khtmlview.h
-===================================================================
---- khtml/khtmlview.h.orig
-+++ khtml/khtmlview.h
-@@ -176,6 +176,11 @@ signals:
+--- khtml/khtmlview.h.sav	2006-05-18 19:06:24.000000000 +0200
++++ khtml/khtmlview.h	2006-05-18 19:18:47.000000000 +0200
+@@ -181,6 +181,11 @@ signals:
      void hideAccessKeys();
      void repaintAccessKeys();
      void findAheadActive( bool );
@@ -201,7 +238,7 @@
  
  protected:
      void clear();
-@@ -206,9 +211,23 @@ protected:
+@@ -211,9 +216,23 @@ protected:
      void contentsContextMenuEvent ( QContextMenuEvent *_ce );
      void doAutoScroll();
      void timerEvent ( QTimerEvent * );


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)