From 6bec1615e1d8536035addc49b106095bdac86a7a Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 2 Nov 2018 13:02:32 +0100
Subject: [PATCH] HoloLens : Improve icons

---
 .../Application/Tools/RiaQIconTools.cpp       |  18 +++++++++++-------
 ApplicationCode/Resources/hololens.png        | Bin 859 -> 859 bytes
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ApplicationCode/Application/Tools/RiaQIconTools.cpp b/ApplicationCode/Application/Tools/RiaQIconTools.cpp
index 8130e664b8..6ed68f4850 100644
--- a/ApplicationCode/Application/Tools/RiaQIconTools.cpp
+++ b/ApplicationCode/Application/Tools/RiaQIconTools.cpp
@@ -25,16 +25,20 @@
 //--------------------------------------------------------------------------------------------------
 QPixmap RiaQIconTools::appendPixmapUpperLeft(const QPixmap& pixmap, const QPixmap& overlayPixmap)
 {
-    QPixmap scaledToFitIncoming;
+    QPixmap scaledPixmap;
     {
-        QSize size = pixmap.size() / 2;
+        QSize size = pixmap.size() - pixmap.size() / 4;
 
-        scaledToFitIncoming = overlayPixmap.scaled(size);
+        scaledPixmap = overlayPixmap.scaled(size);
     }
 
-    QPixmap  pixmapWithSign(pixmap);
-    QPainter painter(&pixmapWithSign);
-    painter.drawPixmap(0, 0, scaledToFitIncoming);
+    QPixmap  combinedPixmap(pixmap);
+    QPainter painter(&combinedPixmap);
 
-    return pixmapWithSign;
+    int x = 0;
+    int y = -4;
+
+    painter.drawPixmap(x, y, scaledPixmap);
+
+    return combinedPixmap;
 }
diff --git a/ApplicationCode/Resources/hololens.png b/ApplicationCode/Resources/hololens.png
index e30dce70372efedfbca8ba7c4adae8027506e64b..a30781563ec09fdcd02b2d8c424469bb9e9dd1d0 100644
GIT binary patch
delta 756
zcmV<Q0t@}y2HOUZBnkm@Qb$4nuFf3kks%X*32;bRa{vGi!vFvd!vV){sAK>D0<1|y
zK~!i%?U%`G6hRb+yF((V7<UnOFeV^KAPSNk^(1)7$y>a8_K=(Y0eTZpUKEAoE_eyq
zT!LT_5d=4IjiSaC6f`=1zwWBBdZwo*k<rRP{otFLS5x!qy{hV}>L@5EC@3f>$fII^
zeUwV2#Arsfn6haV67a32PatmQ2UrSA$hSfQz7-Pit&o6kE$ASN<5&srf-cwrTVV@q
zfHj5{pmr-k`UJn=3%obHffw)`p1^&0NGxi%AQdJ+z{@EPz(Lpx-Jk&fg_PhOn1&G;
zCAP1W#Zm&5AdT=jkW*FoKz%EQuDlq3Em?y>hm-IFTxUK}EGHmYEtO=AC>jL!&x?sc
zH&#pL8DP!7q}Y^Ni%v7dy4id$t1^K<MzNm3J$MX{;3>R?cQ6Zc@DZd{&<bl|9jpiK
zU^@-FVH?yHu_o{EuF44zynd{;jXi+Na090J&x|S?CA!wE_d*{WhEAwby#%y>cmGU`
zRNvtOoTbg}qz2J$HN}3==xHRkgU$nu^b*iEs}YwiX(luy+EwIJw%z|VbDG7Q^znf*
z5q<Pf9D@O9Q=L%@?Xs&xwy9HgN<hXKbU43hWX`}{ux%QNe9E`_=yUqjp*apR=4`!7
z)<{puA!s#rKWMGX_@AiHeiMU#W^)*3-B>MIBOUo=pg&y#>(Cb$L9r;NF*nw7%o&3z
zGo{v^b>f==6H|FfyHr&qmFWYj9mzWJNoQV+mfT8#t~yS9F_{;eOVRtlX;b>tDO1)~
zURDArx$A1;iEE&JKQ}&0J$1lqsB~Tr9a?(~e{&^&1$qt}A~~9bypC#HaU87lJ+DnI
zCScydSKTcNq`S%?*ay0NZ3G?j?eGnB70?^idC<Y*>IfVKz0v6^vJ^gp?)sWxT@G)-
m6_|pcprCmvihctLUqHn`x@X7$0000<MNUMnLSTZE7Xw5@c~gV{

delta 778
zcmcc3cAIU2N<B-uqpu?a!^VE@KZ&di3=E9LLGDfr>(0r%1acITJ%W507^>757#dm_
z7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f-TA0-33Sk!B6Mi^+1ZVz$3C4NPB>>
z+sSM@1_mY>PZ!6KjC*gd@6HZ!6ggi1@qC+xM4)hd#}5t_Lxqk7O)5*nnmWSDvh(LE
z&HX2M@RVENg}4oZkE2;!n*=_vy7jWjf84lWLVLEM@D3fl>T=<`tk1dIQ{SCC^K-7X
zar!yci5@CKoi0ifJ^rj0k&?LFX7^>Wbo546>5XQ$R^7<=mHEuOKj2Ww7XFHE^NQBx
z^%Zizbu$^X3mMoqitk>0V80`0az#t_jz0Nbzia)Q3ojK-UL#`q<+}2ohRZW@7k%)W
zeN@wO`=0`Cj&*5=E172GFfP2B^U44A(n&?<)_#+ET+t~$<A8h3q4YBkv)|nAEL(H9
zDo4O5!hg%$8`Cc5FU(TjwtDHt^c_vrJNnBlWuK+i8?za79KLbUgCTdu`7P-Ma_Ju|
zKJVfF{rL9lV`UHRUK}Y>JiG0<S)%H*mNiDgx4D1TJ4GC2|1s&~Mt1eUBb&H-L(4rC
z*#eGfR2l#0O=9sks-1S}+2cFP7q2tb?hyQa=4s@q%$Tlxfj-Xazwz=nKE8;)QWR+s
zZ7S*NE>p6R^H9C^Tc<0R1h-yYqW@1U+Tl-==;CE@r5BV_mZWv-ubwwCt7tdtk^5O8
zHZr-541GFk4Q6+87yYmfJiO?|(Gccy-Zw<oPMq{-Zvo%*7P&<IYsv{4#&s*sZ8ZPf
zwf_6$B8K)2{u=wtIIsW7`Xl1iXgEh$Z=TNaLZ=^#ULWGB5zqRoS-;Stren3!+Nsc3
zTX8U7zC!5tlDFG}fvHBd#5JNMC9x#cD!C{XNHG{07+UBW8t58YgcuoG8Jk%dm}?st
gSQ!}Ddn>1+Xvob^$xN%nt-()h_D!IM$#TrL0GPl*-v9sr