From 8fbd8b99d7d04299d981b7f29256aeddfb7dec7e Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Wed, 22 Nov 2017 00:14:38 +0100 Subject: [PATCH] leftPanel gradient background --- LeftPanel.qml | 31 ++++++++++++++----------------- components/MenuButton.qml | 2 +- images/balanceGradient.jpg | Bin 4201 -> 0 bytes images/leftPanelBg.jpg | Bin 0 -> 4637 bytes qml.qrc | 2 +- 5 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 images/balanceGradient.jpg create mode 100644 images/leftPanelBg.jpg diff --git a/LeftPanel.qml b/LeftPanel.qml index de8777d0..fd9b880c 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -74,13 +74,23 @@ Rectangle { } width: (isMobile)? appWindow.width : 300 - color: "black" + color: "transparent" anchors.bottom: parent.bottom anchors.top: parent.top + Image { + anchors.left: parent.left + anchors.right: parent.right + anchors.top: parent.top + height: panel.height + source: "images/leftPanelBg.jpg" + z: 1 + } + // card with monero logo Column { visible: true + z: 2 id: column1 height: 200 anchors.left: parent.left @@ -89,20 +99,6 @@ Rectangle { // @TODO: customDecorations? anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0 - Row { - Item { - x: 0 - y: 0 - width: 300 - height: 232 - - Image { - width: 300; height: 232 - source: "images/balanceGradient.jpg" - } - } - } - Row { visible: true Item { @@ -115,7 +111,7 @@ Rectangle { width: 50 * scaleRatio Image { - width: 259; height:170 + width: 259; height: 170 fillMode: Image.PreserveAspectFit source: "images/card-background.png" } @@ -242,12 +238,13 @@ Rectangle { Rectangle { id: menuRect + z: 2 anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom anchors.top: (isMobile)? parent.top : column1.bottom anchors.topMargin: (isMobile)? 0 : 32 - color: "black" + color: "transparent" Flickable { diff --git a/components/MenuButton.qml b/components/MenuButton.qml index 555a03b9..f3ba56f6 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -56,7 +56,7 @@ Rectangle { return offset } - color: "black" + color: "transparent" property bool present: !under || under.checked || checked || under.numSelectedChildren > 0 height: present ? ((appWindow.height >= 800) ? 44 * scaleRatio : 38 * scaleRatio ) : 0 diff --git a/images/balanceGradient.jpg b/images/balanceGradient.jpg deleted file mode 100644 index 24ae02cca0ae9e8c48b410ce4e77b4eca48fdf73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4201 zcmb_fNl+6(6z!QwG9fHxFoEbzP!ukfxS(DvK~T8?CP6K0O2DiTQZO=@W$xL?>z)%b|)6gG;0Pu(}V(j}Ej2vrX0B?@4 zL^6P7IrS=fz!{7tdC>}3hT~WRYvMU{VM`d66AZvOD|W%k9Mkm83B?t*)Y^L9?nzI) zm)rGbVO+tN*?TI-=433&JJ!%zSaN^ys=3F{U0V{ruBh}u_pmvsD#GHJQC*jr)!63h zan76hb>!Q_-qG({_8vTOzP+>W?T@WxhfZF&{;2=m&$QLkQf_t5MxtuMQv)m=Zo!L*PFz2dv3v=v4yi2WmLu;%bU|s*m|EY>0Ug%sw#fn zag-g$jHD%*Gv^kSI@7+MyY^sSa?i-O>bl0ZP|8`ZAZa3J3S~G1qBxnR09JsvjwX-0 zpt*BX&29T`ds)h7r#JW@aC>!Fc_Z*ZbBkFQ;d3>1S<0))V3%XaG)^A47` zM6&}$hUe`X^GB{)7h$&++uMYvF&_5S0&QMkPx#n0J(@c=%8G^X?$u*^upvrXll8!2 z_hGQzy6}8HqG9WNCc=I!Him}6TXHB#4^3Pm93Ws*q@!W0e1`lz`kO#RC(iiHJ8Ifh zPK8}WY+V9_*fg~RS!;pa2%G%sq?&-Q`dVO*giSGqDuF8A)D2#RYzypFuqnnMH35nq zC=o7?8}|9JCt(b7gOTEDf&D>ja!nHpm8^%<2M4BvO)FHz-+{A1>NFEhFKGkn-)i1U z7bDdjF}?T=sDJCRNp>e<<2Q(Yf2)r_JdFvLsTlOPsxpYSph>5*yQube$Z4p1)&IXq z(&;v!{*B4^I2BFGnMMzdzg4FlrA+bC>GZ((+v^`TG&KAff?4w6k1b z*pWx(Fp?X(K{*=+!oika)z6YL9MP%eO=v!mc`Lmt#GfI;P2xP2{2eAXrBLPcsynG% zA(FoX*u?Mx#YBn=tB2IT1K65bQIiwpb^_m7r2ehJCKaMmti;$bc~SfwEOPQ$><@#~ KzjbfVDx4T4`<7znqG zPAHwukQ`mhtq+d1SKohlwefKL)KJ&rOspfI_G!c49!#wfbZ3 z$;Zl(n!hkQ<$lJEQ)=v9|S)!w}$XY+qEdh?&4pS6@eLSlg8FZv{<%C7^ep ziq11R5CN;aC``}FVyIb=#U4?RCE12R6s?c~DWpIuDNvFWC`AgCCI!ln0%b{o{-2{A znp70wbJTkm`&?X@Q+wr}Gs1G|jo7+^X|kq(B)` zpsa4kOK6LwTOkEfblJM)?206is!L?{UXm0jrSoKFlqLnrXcm9?TCBs4-@!#0?rr0B z2Zl<@wXzN_=8ny8ELa3(ttdMV7_RcP5@$8McGD5dZ>&SsNSQ+$o^5vM1X46Rrm=-j zsH8wiO(L_+Q=~v?O|r}9tgrC|%4j^91jcPGg3%_R8pX%8MNFS%UkR+uGlJD l)Ob_TgpK+zZ$swqWxTzwpj58Hghh+r*{3$H_DF%={sEa$lQ{qY literal 0 HcmV?d00001 diff --git a/qml.qrc b/qml.qrc index c8725fd1..25c50f86 100644 --- a/qml.qrc +++ b/qml.qrc @@ -174,7 +174,6 @@ images/moneroIcon-trans56x56.png images/question.png images/expand.png - images/balanceGradient.jpg images/titlebarGradient.jpg images/titlebarLogo.png images/menuArrow.png @@ -187,5 +186,6 @@ components/qmldir components/InlineButton.qml images/lightning.png + images/leftPanelBg.jpg