Merge pull request #17 from micuintus/bugs/Issue9_reSort_Not_working

jrbarron · web-flow · commit d56bd88c722c · 2017-01-04T15:18:42.000+01:00
Add a workaround to Collection::reSort()
diff --git a/collection.cpp b/collection.cpp
@@ -119,7 +119,16 @@ QJSValue Collection::at(int row) const
 
 void Collection::reSort()
 {
-    sort(0);
+    if (dynamicSortFilter())
+    {
+        // Workaround: If dynamic_sortfilter == true, sort(0) will not (always)
+        // result in d->sort() being called, but setDynamicSortFilter(true) will.
+        setDynamicSortFilter(true);
+    }
+    else
+    {
+        sort(0);
+    }
 }
 
 void Collection::reFilter()
@@ -128,4 +137,3 @@ void Collection::reFilter()
 }
 
 } } }
-

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,16 @@ QJSValue Collection::at(int row) const`
`119`	`119`
`120`	`120`	`void Collection::reSort()`
`121`	`121`	`{`
`122`		`- sort(0);`
	`122`	`+ if (dynamicSortFilter())`
	`123`	`+ {`
	`124`	`+ // Workaround: If dynamic_sortfilter == true, sort(0) will not (always)`
	`125`	`+ // result in d->sort() being called, but setDynamicSortFilter(true) will.`
	`126`	`+ setDynamicSortFilter(true);`
	`127`	`+ }`
	`128`	`+ else`
	`129`	`+ {`
	`130`	`+ sort(0);`
	`131`	`+ }`
`123`	`132`	`}`
`124`	`133`
`125`	`134`	`void Collection::reFilter()`
`@@ -128,4 +137,3 @@ void Collection::reFilter()`
`128`	`137`	`}`
`129`	`138`
`130`	`139`	`} } }`
`131`		`-`