File r889439.diff of Package kdebase4-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File r889439.diff of Package kdebase4-workspace

Subject: fix font installer crash
From: wstephenson@suse.de
Bug: kde#174243
Patch-upstream: 889439
--- kcontrol/kfontinst/kcmfontinst/FontList.cpp	(revision 889438)
+++ kcontrol/kfontinst/kcmfontinst/FontList.cpp	(revision 889439)
@@ -2225,6 +2225,12 @@ void CFontListView::contextMenuEvent(QCo
     }
 }
 
+bool CFontListView::viewportEvent(QEvent *event)
+{
+    executeDelayedItemsLayout();
+    return QTreeView::viewportEvent(event);
+}
+
 }
 
 #include "FontList.moc"
--- kcontrol/kfontinst/kcmfontinst/GroupList.cpp	(revision 889438)
+++ kcontrol/kfontinst/kcmfontinst/GroupList.cpp	(revision 889439)
@@ -959,6 +959,12 @@ void CGroupListView::drawHighlighter(con
     }
 }
 
+bool CGroupListView::viewportEvent(QEvent *event)
+{
+    executeDelayedItemsLayout();
+    return QTreeView::viewportEvent(event);
+}
+
 }
 
 #include "GroupList.moc"
--- kcontrol/kfontinst/kcmfontinst/FontList.h	(revision 889438)
+++ kcontrol/kfontinst/kcmfontinst/FontList.h	(revision 889439)
@@ -360,6 +360,7 @@ class CFontListView : public QTreeView
     void            dragEnterEvent(QDragEnterEvent *event);
     void            dropEvent(QDropEvent *event);
     void            contextMenuEvent(QContextMenuEvent *ev);
+    virtual bool    viewportEvent(QEvent *event);
 
     private:
 
--- kcontrol/kfontinst/kcmfontinst/GroupList.h	(revision 889438)
+++ kcontrol/kfontinst/kcmfontinst/GroupList.h	(revision 889439)
@@ -224,6 +224,7 @@ class CGroupListView : public QTreeView
     void                  dragLeaveEvent(QDragLeaveEvent *event);
     void                  dropEvent(QDropEvent *event);
     void                  drawHighlighter(const QModelIndex &idx);
+    virtual bool          viewportEvent(QEvent *event);
 
     private:
 
Index: kcontrol/kfontinst/kcmfontinst/FontList.cpp
===================================================================
Index: kcontrol/kfontinst/kcmfontinst/GroupList.cpp
===================================================================
Index: kcontrol/kfontinst/kcmfontinst/FontList.h
===================================================================
Index: kcontrol/kfontinst/kcmfontinst/GroupList.h
===================================================================

Places

File r889439.diff of Package kdebase4-workspace

Places