rpms/kdelibs/devel kdelibs-4.0.1-kde#771201-khtml.patch, NONE, 1.1 kdelibs.spec, 1.268, 1.269

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31257

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.1-kde#771201-khtml.patch 
Log Message:
upstream patch to make sure that static widget is always at position 0,


kdelibs-4.0.1-kde#771201-khtml.patch:

--- NEW FILE kdelibs-4.0.1-kde#771201-khtml.patch ---
Index: khtml/khtmlview.cpp
===================================================================
--- khtml/khtmlview.cpp	(Revision 771203)
+++ khtml/khtmlview.cpp	(Revision 771204)
@@ -485,6 +485,13 @@
       // not permitting us to forward it up the part hiearchy in our dragEnterEvent,
       // etc. handlers
       return QWidget::event(e);
+    case QEvent::StyleChange:
+    case QEvent::LayoutRequest: {
+        bool ret = QScrollArea::event(e);
+        if (d->staticWidget && widget()->pos() != QPoint(0,0))
+            widget()->move(0,0);
+        return ret;
+    }
     default:
       return QScrollArea::event(e);
     }
@@ -2108,6 +2115,12 @@
     if (o == view) {
         if (widgetEvent(e))
             return true;
+        else if ( e->type() == QEvent::Resize ) {
+            bool ret = QScrollArea::eventFilter(o, e);
+            if (d->staticWidget && view->pos() != QPoint(0,0))
+                view->move(0,0);
+            return ret;
+        }
     } else if (o->isWidgetType()) {
 	QWidget *v = static_cast<QWidget *>(o);
         QWidget *c = v;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- kdelibs.spec	4 Feb 2008 17:08:46 -0000	1.268
+++ kdelibs.spec	6 Feb 2008 10:32:04 -0000	1.269
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -64,6 +64,7 @@
 # upstream patches
 Patch100: kdelibs-4.0.1-objectembed-handling.patch
 Patch101: kdelibs-4.0.1-autostart.patch
+Patch102: kdelibs-4.0.1-kde#771201-khtml.patch
 
 BuildRequires: qt4-devel >= 4.3.0
 Requires: qt4 >= %{_qt4_version} 
@@ -152,6 +153,7 @@
 # upstream patches
 %patch100 -p0 -b .objectembed-handling
 %patch101 -p1 -b .xdg-autostart
+%patch102 -p0 -b .kde#771201-khtml
 
 %build
 
@@ -279,6 +281,9 @@
 
 
 %changelog
+* Wed Feb 06 2008 Than Ngo <than at redhat.com> 4.0.1-4
+- upstream patch to make sure that static widget is always at position 0,0
+
 * Fri Feb 01 2008 Than Ngo <than at redhat.com> 4.0.1-3
 - upstream patch to fix a regression in <object><embed> handling
 - autostart upstream patch