Fix bug in resource packing.

Fixes #107.

Author: niemeyer

qml_test.go

@@ -409,6 +409,26 @@ func testResourcesLoaded(c *C, loaded bool) {
 	c.Assert(c.GetTestLog(), Matches, "(?s).*(<Foo>.*<Bar>|<Bar>.*<Foo>).*")
 }
 
+func (s *S) TestResourcesIssue107(c *C) {
+	var rp qml.ResourcesPacker
+
+	rp.Add("a/Foo.qml", []byte("import QtQuick 2.0\nItem { Component.onCompleted: console.log('<Foo>') }"))
+	rp.Add("b/Bar.qml", []byte("import QtQuick 2.0\nItem { Component.onCompleted: console.log('<Bar>') }"))
+	rp.Add("c/Baz.qml", []byte("import QtQuick 2.0\nItem { Component.onCompleted: console.log('<Baz>') }"))
+	rp.Add("d/Buz.qml", []byte("import QtQuick 2.0\nItem { Component.onCompleted: console.log('<Buz>') }"))
+
+	r := rp.Pack()
+	qml.LoadResources(r)
+
+	for _, name := range []string{"a/Foo", "b/Bar", "c/Baz", "d/Buz"} {
+		component, err := s.engine.LoadFile("qrc:///" + name + ".qml")
+		c.Assert(err, IsNil)
+		root := component.Create(nil)
+		defer root.Destroy()
+	}
+	c.Assert(c.GetTestLog(), Matches, "(?s).*<Foo>.*<Bar>.*<Baz>.*<Buz>.*")
+}
+
 type TestData struct {
 	*C
 	engine           *qml.Engine

resources.go

@@ -164,7 +164,7 @@ func newResourcesWriter(rp *ResourcesPacker) *resWriter {
 		treeOffsets: make(map[*resFile]int),
 		dataOffsets: make(map[*resFile]int),
 		nameOffsets: make(map[string]int),
-		pending:     make([]*resFile, maxDepth(&rp.root)),
+		pending:     make([]*resFile, maxPending(&rp.root)),
 	}
 
 	pending := rw.pending
@@ -185,14 +185,14 @@ func newResourcesWriter(rp *ResourcesPacker) *resWriter {
 	return rw
 }
 
-func maxDepth(file *resFile) int {
-	max := 0
+func maxPending(file *resFile) int {
+	max := 1
 	for i := range file.children {
-		if n := maxDepth(&file.children[i]); n > max {
-			max = n
+		if len(file.children) > 0 {
+			max += maxPending(&file.children[i])
 		}
 	}
-	return max + 1
+	return max
 }
 
 func (rw *resWriter) write() {