diff --git a/eww/eww.yuck b/eww/eww.yuck index 2f2cfac..ecaf453 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -186,7 +186,9 @@ :halign "end" :valign "center" :height 30 - (testtime))) + (space) + (testtime) + (space))) (defwidget mediaBox [] (box @@ -262,12 +264,19 @@ :height 30 :valign "center" :halign "end" - (testtime - :name "US East" - :timezone "EST") - (testtime - :timezone "Asia/Seoul" - :image "../images/SamGuk-by_Sang_Min.png") + (box + :class "barbox" + :space-evenly false + :spacing 2 + (space) + (testtime + :timezone "US/Eastern" + :image "../images/USTime.png") + (seperator) + (testtime + :timezone "Asia/Seoul" + :image "../images/SamGuk-by_Sang_Min.png") + (space)) (box :class "barbox" :spacing 2 diff --git a/eww/templates.yuck b/eww/templates.yuck index 8b790f8..bc2f65c 100644 --- a/eww/templates.yuck +++ b/eww/templates.yuck @@ -89,32 +89,26 @@ (defwidget testtime [?name ?icon ?timezone ?image] (box - :class "barbox" + :onclick `` + :class "smallBox" + :spacing 1 :space-evenly false - :spacing 3 + :valign "center" + :height 20 (space) - (box - :onclick `` - :class "smallBox" - :spacing 1 - :space-evenly false - :valign "center" - :height 20 - (space) - (eventbox - (box - :spacing 3 - :space-evenly false - :valign "center" - :height 20 - (imageDPI - :image image - :size 16 - :visible {image != "" ? true : false}) - (label - :truncate {name != "" ? true : false } - :truncate-left {name != "" ? true : false } - :text {timezone != "" ? "${name} ${formattime(EWW_TIME, "%H:%M", timezone)}" : "${formattime(EWW_TIME, "%H:%M:%S")}"} - :tooltip {timezone != "" ? "${formattime(EWW_TIME, "%A %d.%m.%G", timezone)}" : "${formattime(EWW_TIME, "%A %d.%m.%G")}"}))) - (space)) + (eventbox + (box + :spacing 3 + :space-evenly false + :valign "center" + :height 20 + (imageDPI + :image image + :size 16 + :visible {image != "" ? true : false}) + (label + :truncate {name != "" ? true : false } + :truncate-left {name != "" ? true : false } + :text {timezone != "" ? "${name} ${formattime(EWW_TIME, "%H:%M", timezone)}" : "${formattime(EWW_TIME, "%H:%M:%S")}"} + :tooltip {timezone != "" ? "${formattime(EWW_TIME, "%A %d.%m.%G", timezone)}" : "${formattime(EWW_TIME, "%A %d.%m.%G")}"}))) (space))) diff --git a/images/USTime.png b/images/USTime.png new file mode 100644 index 0000000..58f4c0b Binary files /dev/null and b/images/USTime.png differ