Merge branch 'qml_app_face_generator' into GSoC2017-evaluation-final

retroshare-qml-app/src/components/Faces.qml

@@ -13,17 +13,17 @@ Item
 
 	Image
 	{
-		id: faceAvatar
+		id: imageAvatar
-		width: iconSize
+		width: height
 		height: iconSize
 		visible: true
 	}
 
 	Canvas
 	{
-		id: faceCanvas
+		id: canvasAvatar
-		width: iconSize
+		width: height
-		height: iconSize
+		height: canvasSizes
 		visible: false
 
 		renderStrategy: Canvas.Threaded;
@@ -134,11 +134,11 @@ Item
 		{
 			var url = src(gender, i, data[i+1])
 			onloads.push(url)
-			faceCanvas.loadImage(url)
+			canvasAvatar.loadImage(url)
 		}
-		faceCanvas.images = onloads
+		canvasAvatar.images = onloads
-		faceCanvas.callback = callback
+		canvasAvatar.callback = callback
-		faceCanvas.requestPaint()
+		canvasAvatar.requestPaint()
 	}
 
 	// Create the identicon
@@ -154,14 +154,20 @@ Item
 			    // See issue: https://gitlab.com/angesoc/RetroShare/issues/37
 			    if (facesCache.iconCache[iconId])
 				{
-					faceAvatar.source =  data
+					imageAvatar.source =  data
-					faceAvatar.visible = true
+					imageAvatar.visible = true
-					faceCanvas.visible =  false
+					canvasAvatar.visible =  false
+
+					canvasAvatar.height = 0
+					imageAvatar.height = iconSize
 				}
 				else
 				{
-					faceCanvas.visible =  true
+					canvasAvatar.visible =  true
-					faceAvatar.visible =  false
+					imageAvatar.visible =  false
+
+					canvasAvatar.height = iconSize
+					imageAvatar.height = 0
 				}
 
 				facesCache.iconCache[iconId] = data;