Fixed bar stuff

eww/.config/eww/eww.scss

@@ -32,9 +32,8 @@ $anim-transition: 150ms;
 	// color: $fg-color;
 }
 
-// Bar styles
+tooltip {
-.time-thing {
+	background-color: $red;
-	opacity: 0.2;
 }
 
 .bar-1, .bar-2 {
@@ -44,6 +43,9 @@ $anim-transition: 150ms;
 	padding: .3rem;
 }
 
+.segment-end {
+}
+
 // Styles on classes (see eww.yuck for more information)
 button {
 	transition-property: opacity, color;
@@ -87,10 +89,11 @@ scale trough {
 .powermenu {
 	transition: color $anim-transition;
 	// border-right: solid 1px $border-color;
+	padding: .5rem .2rem .3rem .2rem;
 }
 
 .quit, .lock, .reboot, .poweroff {
-	padding: .5rem .2rem .3rem 0rem;
+	// padding: .5rem .2rem .3rem .2rem;
 }
 
 // Colors for the buttons
@@ -122,6 +125,7 @@ scale trough {
 	margin: 0 .2rem;
 	font-size: $icon-size;
 	font-family: Material Icons;
+	padding: 0 1px;
 }
 
 .icon:hover {
@@ -138,33 +142,39 @@ scale trough {
 // Time
 .time {
 	font-size: 11px;
-	// border-radius: 5px;
+	font-weight: bold;
 	border-top: solid 2px $border-color;
 	color: $fg-alt-color;
-	padding: .7rem 0;
+	padding: 1rem 0;
-	padding-bottom: .5rem;
+	padding-bottom: 0rem;
 	margin: .5rem 0 .5rem 0;
 }
 
-
-
 // Logo button
 .logo {
+	margin: 0 .8rem;
 	margin-top: 6px;
 	font-size: $logo-size;
-	opacity: 0.8;
+	opacity: 0.5;
 }
 
 .logo-seperator {
 	border-bottom: 2px solid $border-color;
+	padding-bottom: .4rem;
 }
 
-// .logo:hover {
-// 	// color: $red;
-// }
-
 // Color overrides
 .red {
 	color: $red;
 	opacity: 0.8;
 }
+
+
+// Music widget
+.musicmenu {
+	// background-color: $bg-alt-color;
+}
+
+.mm-inner {
+	color: $blue;
+}

eww/.config/eww/eww.yuck

@@ -4,34 +4,59 @@
        :hexpand "false"
     (box :class "segment-start"
          :valign "start"
+         :halign "center"
          :space-evenly false
          :orientation "v"
          :space-evenly false
-      ;; (logo)
+      (power :screen screen)
-      (power)
     )
     (box :class "segment-mid"
          :valign "center"
+         :halign "center"
          :orientation "v"
          :space-evenly false
-      (workspaces :wsp workspaces-data)
+      (workspaces :wsp workspaces-data :screen screen)
     )
     (box :class "segment-end"
          :valign "end"
+         :halign "center"
          :orientation "v"
-         :space-evenly false
+         :space-evenly true
-      (control)
+      (control :screen screen)
     )
   )
 )
 
-;; Logo widget
+(defwidget bar-2 [screen]
-(defwidget logo []
+  (box :orientation "v"
-    (button :class "logo"
+       :vexpand "false"
-        "Λ"
+       :hexpand "false"
-     ))
+    (box :class "segment-start"
+         :valign "start"
+         :halign "center"
+         :space-evenly false
+         :orientation "v"
+         :space-evenly false
+      ;; (power :screen screen)
+    )
+    (box :class "segment-mid"
+         :valign "center"
+         :halign "center"
+         :orientation "v"
+         :space-evenly false
+      (workspaces :wsp workspaces-data :screen screen)
+    )
+    (box :class "segment-end"
+         :valign "end"
+         :halign "center"
+         :orientation "v"
+         :space-evenly true
+        (control-2 :screen screen)
+    )
+  )
+)
 
-;; Powermenu Widgets ;;
+;; Powermenu widget
 (defwidget power []
   (eventbox  ;;:onhover "${EWW_CMD} update power=true"
              :onhoverlost "${EWW_CMD} update power=false"
@@ -73,8 +98,6 @@
                      :onclick "poweroff now"  "")
 
         ))
-
-        ;; Poweroff
         )))
 (defvar power false)
 
@@ -83,11 +106,22 @@
   (box :class "control" :spacing 12 :space-evenly false :orientation "v"
     ;; (wifi)
     ;; (bat)
+    (music)
     (volume)
     (time)
     )
   )
 
+(defwidget control-2 []
+  (box :class "control" :spacing 12 :space-evenly false :orientation "v"
+    ;; (wifi)
+    ;; (bat)
+    ;; (music)
+    ;; (volume)
+    (time)
+    )
+  )
+
 ;; Clock Widget
 (defwidget time []
   (box  :orientation "v"
@@ -110,7 +144,7 @@
                 :onhoverlost "${EWW_CMD} update volume=false"
     (box        :orientation "v"
                 :space-evenly "false"
-                :spacing "2"
+                :spacing 2
       (revealer :transition "slideup"
                 :reveal volume
                 :duration "450ms"
@@ -169,18 +203,56 @@
            ))
 (deflisten workspaces-data "scripts/workspace.py")
 
-
+;; Music widget
-(defwidget metric [label value onchange]
+(defwidget music []
+  (revealer      :reveal {music-status == "Playing" || music-status == "Paused"}
+    (eventbox    :onhover "${EWW_CMD} update music=true"
+                 :onhoverlost "${EWW_CMD} update music=false"
+                 ;; :onclick "wget ${artUrl} -O /tmp/cover.jpg; sleep 1; notify-send -i /tmp/cover.jpg '${title} - ${artist}' '${songtime}'"
         (box     :orientation "v"
-       :class "metric"
+                :space-evenly "false"
-       :space-evenly false
+                :vexpand "false"
-    (box :class "label" label)
+                :class "musicmenu ${music ? 'mm-active' : ''}"
-    (scale :min 0
+        (revealer  :transition "slideup"
-           :max 101
+                    :reveal music
-           ;; :orientation "v"
+                    :flipped true
-           :active {onchange != ""}
+                    :duration "450ms"
-           :value {value == "" ? "0" : value}
+            (box     :orientation "v"
-           :onchange onchange)))
+                    :class "mm-inner"
+                    :space-evenly true
+                    :halign "middle"
+                    :spacing 4
+
+                ;; Next
+                (button    :class "icon next"
+                            :tooltip "Pause/play"
+                            :onclick "playerctl next" "")
+                ;; Pause
+                (button    :class "icon pause"
+                            :tooltip "Pause/play"
+                            :onclick "playerctl play-pause" {music-status == "Playing" ? "" : ""})
+
+                ;; Pause
+                (button    :class "icon prev"
+                            :tooltip "Pause/play"
+                            :onclick "playerctl previous" "")
+
+            ))
+        ;; Open menu button
+        (button     :class "icon"
+                    :tooltip "${title} - ${artist}"
+                    :onclick "${EWW_CMD} update music=true"  "")
+
+            )
+    )))
+
+(defpoll music-status         :interval "200ms"  "playerctl status")
+(defpoll artUrl               :interval "200ms"  "playerctl metadata artUrl")
+(defpoll title                :interval "200ms"  "playerctl metadata title")
+(defpoll artist               :interval "200ms"  "playerctl metadata artist")
+(defpoll songtime             :interval "500ms"  "scripts/getSongDuration")
+
+(defvar music false)
 
 ;; WINDOWS
 (defwindow bar-1
@@ -207,7 +279,7 @@
   :reserve (struts :side "left" :distance "42px")
   :hexpand "false"
   :vexpand "false"
-  (bar :screen 2))
+  (bar-2 :screen 2))
 
 (defwindow time-thing
     :monitor 0