From f433020d1de129b488b008ce166642ea54eeb615 Mon Sep 17 00:00:00 2001
From: "B.Melnik" <b.melnik@restream.rt.ru>
Date: Wed, 19 May 2021 21:31:18 +0300
Subject: [PATCH] feat: commit dotherside

---
 ui/app/img/traffic_lights/close.png           | Bin 0 -> 493 bytes
 ui/app/img/traffic_lights/close_pressed.png   | Bin 0 -> 481 bytes
 ui/app/img/traffic_lights/maximize.png        | Bin 0 -> 340 bytes
 .../img/traffic_lights/maximize_pressed.png   | Bin 0 -> 299 bytes
 ui/app/img/traffic_lights/minimise.png        | Bin 0 -> 222 bytes
 .../img/traffic_lights/minimise_pressed.png   | Bin 0 -> 214 bytes
 ui/main.qml                                   |  13 ++-
 ui/nim-status-client.pro                      |   1 +
 ui/shared/MacTrafficLights.qml                | 110 ++++++++++++++++++
 vendor/DOtherSide                             |   2 +-
 10 files changed, 123 insertions(+), 3 deletions(-)
 create mode 100644 ui/app/img/traffic_lights/close.png
 create mode 100644 ui/app/img/traffic_lights/close_pressed.png
 create mode 100644 ui/app/img/traffic_lights/maximize.png
 create mode 100644 ui/app/img/traffic_lights/maximize_pressed.png
 create mode 100644 ui/app/img/traffic_lights/minimise.png
 create mode 100644 ui/app/img/traffic_lights/minimise_pressed.png
 create mode 100644 ui/shared/MacTrafficLights.qml

diff --git a/ui/app/img/traffic_lights/close.png b/ui/app/img/traffic_lights/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..b310f2194021ea7a90d3e0752137b3dec6fb1b38
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0fI?HK~#7FrIpW3
z!!Q)azvm>y5)$eNWrH#RQab_@&<!Xzgi2|p9yr1Tzy{fXiV4_&T)9P@OkHB^NR>hr
z$A9{r9RK-!@w5FNL2I5JT`9uIwB?4bA0P@u>Nd-UOeOu*R;<l8-DP}2z;k0xv5^?Z
zn9Ngt55i){`Ih{Qky69Gd4pbtw;S*Q0<;IOIVU|aWjZuP%lsgd7I>{nQJ+j>mhl$`
zT(+!rhRX(rQYB02jG6XIib(~$B5)_2aH_@&Aqr~thwQ`&m-54W(*C%Qi7&j>z-2;E
zxdKgn;8p{N34Gy3iEYh$waw3y^i==B5Rvds11}Q?+=#&;rtoPUBr1hWN_2?22CcW{
zzd9cy9SC=tupqdOxlWFG%M$C0XCZKNpv&#gMMzqq5P0*p_@)(#frpq-EZoP$RJ5cn
znS{p}xKYPr?DrD+rAsCTvGASj^@K{M2iAwcn<jegQ=_X$j(J|6feDjN2|AAYo>R39
jg*P=z`6#8|a>w`s<;5Q&zh{o800000NkvXXu0mjf8FSQE

literal 0
HcmV?d00001

diff --git a/ui/app/img/traffic_lights/close_pressed.png b/ui/app/img/traffic_lights/close_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd0745e309e88181c2454190f37e69dc81ef2803
GIT binary patch
literal 481
zcmV<70UrK|P)<h;3K|Lk000e1NJLTq000;O000>X1^@s6D=Y3@00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0d`45K~#7F)s-<$
z!!Q(v-}AGjju}~i93iX-M7aTMu(c;Z+<=~dass-s!U+n69gYye0$au^Aqme#t=h(M
z?7-50h@MjS`<y(-2H5nFzH|YCZKAUsqTszKV)(~k7a+`)8gm`aZU77?S#}96vJViE
zQrFA~0P%j3rUN{Xa)^i*Yhy>xS=I-S%-~Xv85}I#?u(l7y+fsL;csxABO&<-xJcSc
zEO4DC@i?8vIlyrni49&N4)`^Xa4}e^h?kUZwrM7no;1N<()3E#xbi1Qi7UJ!aFOI$
zcH;^+3LGTHnBcVnUr8O@DsYw9;5r1Bd=$m!F3}g4Ct#l48#n&k#;^+XY7s)*aYH*b
zL$-JVA#acm-hzfNbUBetLf-JQObky{D-k|$-BA8*kINXUF>Wj91D~&!Zl@FGdA>M9
z*0Qp#pf7wLR|&R(`$&F|OetS|;ZBmGI2GSg_S(XA^m#%=`aFpZj7ab$X$x<X@Z?87
XW4h1RgDXyH00000NkvXXu0mjfW;w=R

literal 0
HcmV?d00001

diff --git a/ui/app/img/traffic_lights/maximize.png b/ui/app/img/traffic_lights/maximize.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb7f2ad5e2656a7bf74b7866b772a02d2cbc0dd7
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9EO-XP4l)OOlRpde#$
zkh>GZx^prwfgF}}M_)$<hK>E)e-c@N{Fk0Cjv*C{Td(?ZH91He`&jOi?6JbK$^8S@
zy(PUDw$0v>d419BE4-iBZt|un?|E?ih=<_PXEk=*g01)E9VM97yH?K8V@XWdwM_G4
z&(rsh1L7Xl)G`Zb3K&Q$x*o}BYd9QUa(t5O?Ry7HgyLBx?F;O_SuxB$`=E@GHAauc
z-{SVBf9)6lGr8{R+r@os$3^ap2Y=%^t>P0JR<rXIZf#(-lizUUKfBC>%Z%<nDh?>x
z@mL(&&n)-B|A6p4b`7TQt*6h<OEjz4y=L+O@qcj-gy-{E9Bke3NKk&Ux>Qg?;^nso
j3z|6M=B{$OXV19&)xJAl<Fvm6J<Z_h>gTe~DWM4f<0FOw

literal 0
HcmV?d00001

diff --git a/ui/app/img/traffic_lights/maximize_pressed.png b/ui/app/img/traffic_lights/maximize_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..51ec389c80bace73ee4fef7bcd893b87b3447b6e
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9EO-XP4l)OOlRpde#$
zkh>GZx^prwfgF}}M_)$<hK>E)e-c@N`~#jYjv*C{Tc<tbJ)|JuX7BO;HAl|@F28ls
zC)i%G`7DqNowY)t;LcvQOD)g#noQWjCh0G}fqlL<Q?LFslgR$hvl2crF!efTo}F+l
z@&S|DY#W7X*L2k~PA+G%{d9y$cW1rqjECkgrcVChVZBG1i|6G1<(sSzOe|;L@oC+G
zo;{K?rvB&kII)^hv(ivO^FOD@X?rHAPr3_K&o{16^`G%fSoqWKNc%LaPd!(sTxVt~
sx^-Rnuh$(P)dv}64}@P{Xes&3Vjomm*mgY6ALthbPgg&ebxsLQ08JioJpcdz

literal 0
HcmV?d00001

diff --git a/ui/app/img/traffic_lights/minimise.png b/ui/app/img/traffic_lights/minimise.png
new file mode 100644
index 0000000000000000000000000000000000000000..5006f0182812ca1797737b679032e72eddf82e12
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^3P8-p!3HE3_0PEvq&N#aB8wRqbi6^BajEUJl|Vtp
z;vjb?hIQv;UIIBR>5jgR3=A9lx&I`x0{O+BE{-7;j7KkR6m)P9V7;*abkCO(2iB+s
z%#D&OCv=@y64J;u<$;xgG1IlcBX_yW{^fj{%x~d#|7G#ga}C;TLJ<o5x*y){l;nF`
z->?1P>J;}4EfHEA*}}<L+*2nV7nTvIGHT;r{*SjLb;nGJgIX8A?l`W`w_9?FRc*aJ
P(0T?>S3j3^P6<r_CUHw?

literal 0
HcmV?d00001

diff --git a/ui/app/img/traffic_lights/minimise_pressed.png b/ui/app/img/traffic_lights/minimise_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2ef4c4ac100f9d9e59d4508b854a3126872ea01
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3P8-p!3HE3_0PEvq&N#aB8wRqbi6^BajEUJl|Vtp
z;vjb?hIQv;UIIBR>5jgR3=A9lx&I`x0{PjVE{-7;j7Kjx@;Mj?v_9Ogx~sIs>&P|H
z9gVF=u6?v%^-IWK{C&cdX~r4*kDf^h)8|(bt}B@pqv@t&${2BDQg^A*j4Spb$IkWs
zd-TWuP(`{#x!5B8OreubEQc<gnzG~GrS`7Ny1o%<b{cZJWx{%)(r?6p)-rgy`njxg
HN@xNAPQXcB

literal 0
HcmV?d00001

diff --git a/ui/main.qml b/ui/main.qml
index dc0f903ffd..55cc8abe32 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -89,7 +89,7 @@ StatusWindow {
 
     //! Workaround for custom QQuickWindow
     Connections {
-        target: applicationWindow
+        target: c
         onClosing: {
             if (loader.sourceComponent == login) {
                 applicationWindow.visible = false;
@@ -106,7 +106,7 @@ StatusWindow {
         }
 
         onActiveChanged: {
-            if (active && currentlyHasANotification) {
+            if (applicationWindow.active && currentlyHasANotification) {
                 currentlyHasANotification = false
                 // QML doesn't have a function to hide notifications, but this does the trick
                 systemTray.hide()
@@ -409,6 +409,15 @@ StatusWindow {
     NotificationWindow {
         id: notificationWindow
     }
+
+    MacTrafficLights {
+        parent: Overlay.overlay
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.margins: 13
+
+        visible: Qt.platform.os === "osx" && !applicationWindow.isFullScreen
+    }
 }
 
 /*##^##
diff --git a/ui/nim-status-client.pro b/ui/nim-status-client.pro
index 577353490f..abff77f9c5 100644
--- a/ui/nim-status-client.pro
+++ b/ui/nim-status-client.pro
@@ -387,6 +387,7 @@ DISTFILES += \
     shared/ImageCropperModal.qml \
     shared/Input.qml \
     shared/LabelValueRow.qml \
+    shared/MacTrafficLights.qml \
     shared/ModalPopup.qml \
     shared/NotificationWindow.qml \
     shared/PopupMenu.qml \
diff --git a/ui/shared/MacTrafficLights.qml b/ui/shared/MacTrafficLights.qml
new file mode 100644
index 0000000000..0df830a8e5
--- /dev/null
+++ b/ui/shared/MacTrafficLights.qml
@@ -0,0 +1,110 @@
+import QtQuick 2.13
+
+import "../imports"
+
+MouseArea {
+    id: statusMacWindowButtons
+
+    hoverEnabled: true
+
+    width: layout.implicitWidth
+    height: layout.implicitHeight
+
+    readonly property color inactive: Style.current.name === Constants.lightThemeName ? "#D5CDCF"
+                                                                                      : "#524d51"
+    readonly property color inactiveBorder: Style.current.name === Constants.lightThemeName ? "#B3ABAD"
+                                                                                            : "#D14C40"
+
+
+
+    Row {
+        id: layout
+        spacing: 8
+
+        Rectangle {
+            width: 12
+            height: 12
+            radius: width / 2
+            antialiasing: true
+
+            color: closeSensor.pressed ? "#B24F47" : (applicationWindow.active || statusMacWindowButtons.containsMouse ? Qt.lighter("#E9685C", 1.07)
+                                                                        : inactive )
+            border.color:closeSensor.pressed ? "#943229" : (applicationWindow.active ? "#D14C40"
+                                                                              : inactiveBorder)
+            border.width: Style.current.name === Constants.lightThemeName ? 0.5 : 0
+
+            Image {
+                anchors.centerIn: parent
+                visible: statusMacWindowButtons.containsMouse
+                source: closeSensor.pressed ? "../app/img/traffic_lights/close_pressed.png"
+                                            : "../app/img/traffic_lights/close.png"
+                scale: 0.25
+            }
+
+
+            MouseArea {
+                id: closeSensor
+                anchors.fill: parent
+
+                onClicked: applicationWindow.close()
+            }
+        }
+
+        Rectangle {
+            width: 12
+            height: 12
+            radius: width / 2
+            antialiasing: true
+
+            color: miniSensor.pressed ? "#878E3B" :  (applicationWindow.active || statusMacWindowButtons.containsMouse ? Qt.lighter("#EDB84C", 1.07)
+                                                                       : inactive)
+            border.color:miniSensor.pressed ? "#986E29" : (applicationWindow.active ? "#D79F3D"
+                                                                             : inactiveBorder)
+            border.width: Style.current.name === Constants.lightThemeName ? 0.5 : 0
+
+            Image {
+                anchors.centerIn: parent
+                anchors.verticalCenterOffset: -0.25
+                visible: statusMacWindowButtons.containsMouse
+                source: miniSensor.pressed ? "../app/img/traffic_lights/minimise_pressed.png"
+                                           : "../app/img/traffic_lights/minimise.png"
+                scale: 0.27
+            }
+
+            MouseArea {
+                id: miniSensor
+                anchors.fill: parent
+
+                onClicked: applicationWindow.showMinimized()
+            }
+        }
+
+        Rectangle {
+            width: 12
+            height: 12
+            radius: width / 2
+            antialiasing: true
+
+            color: maxiSensor.pressed ? "#48943f" : (applicationWindow.active || statusMacWindowButtons.containsMouse ?  Qt.lighter("#62C454", 1.06)
+                                                                       : inactive)
+            border.color: maxiSensor.pressed ? "#357225" : (applicationWindow.active ? "#53A73E"
+                                                                              : inactiveBorder)
+            border.width: Style.current.name === Constants.lightThemeName ? 0.5 : 0
+
+            Image {
+                anchors.centerIn: parent
+                visible: statusMacWindowButtons.containsMouse
+                source:   maxiSensor.pressed ?"../app/img/traffic_lights/maximize_pressed.png"
+                                             :"../app/img/traffic_lights/maximize.png"
+                scale: 0.25
+            }
+
+            MouseArea {
+                id: maxiSensor
+                anchors.fill: parent
+
+                onClicked: applicationWindow.toggleFullScreen()
+            }
+        }
+    }
+}
diff --git a/vendor/DOtherSide b/vendor/DOtherSide
index 3c5eeedb6e..dcece83df9 160000
--- a/vendor/DOtherSide
+++ b/vendor/DOtherSide
@@ -1 +1 @@
-Subproject commit 3c5eeedb6ec22ff16871de95e14144ff7d19ffe3
+Subproject commit dcece83df9f25d37a5027835e7b55919af26ae2e