From 0fa26d83f6a8243c464e3759e0660dc1ba41d85c Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@gmail.com>
Date: Fri, 17 Feb 2017 19:47:30 -0500
Subject: [PATCH] Start tweaking alignments to make look a little better and
 take up proper spacing.

---
 src/ui/PlayerInterface.cpp | 11 +++++++++--
 src/ui/PlayerInterface.h   |  1 +
 src/ui/TrackDetails.cpp    | 18 ++++++++++++------
 src/ui/TrackDetails.h      |  1 -
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/ui/PlayerInterface.cpp b/src/ui/PlayerInterface.cpp
index babfdca..b5b8e0b 100644
--- a/src/ui/PlayerInterface.cpp
+++ b/src/ui/PlayerInterface.cpp
@@ -22,6 +22,8 @@
 #include "../GroovePlayer.h"
 #include <grooveplayer/player.h>
 #include <Wt/WLength>
+#include <Wt/WColor>
+#include <Wt/WBorder>
 
 PlayerInterface::PlayerInterface(WebInterface* app)
 {
@@ -30,8 +32,11 @@ PlayerInterface::PlayerInterface(WebInterface* app)
     this->setLayout(interfaceLayout);
     playControlLayout = new Wt::WHBoxLayout();
     voteControlLayout = new Wt::WVBoxLayout();
+    playControlWidget = new Wt::WContainerWidget();
+    playControlWidget->setLayout(playControlLayout);
     
     currentTrackProgress = new Wt::WProgressBar();
+    currentTrackProgress->decorationStyle().setBackgroundColor(Wt::WColor("#B20A5E"));
     currentTrackProgress->setFormat("");
     trackProgress = new Wt::WTimer();
     trackProgress->setInterval(1000);
@@ -43,10 +48,12 @@ PlayerInterface::PlayerInterface(WebInterface* app)
     isPaused = groove_playlist_playing(GroovePlayerMgr::getInstance()->currentPlaylist)==0;
     playpause->clicked().connect(this, &PlayerInterface::playpauseClicked);
     
-    interfaceLayout->addLayout(playControlLayout);
+    interfaceLayout->addWidget(playControlWidget);
     interfaceLayout->addWidget(currentTrackProgress);
     interfaceLayout->addLayout(voteControlLayout);
-    playControlLayout->addWidget(playpause,0,Wt::AlignmentFlag::AlignCenter | Wt::AlignmentFlag::AlignMiddle);
+    playControlWidget->decorationStyle().setBorder(Wt::WBorder::Outset);
+    playControlWidget->decorationStyle().setBackgroundColor(Wt::WColor("#00B200"));
+    playControlLayout->addWidget(playpause,0,Wt::AlignmentFlag::AlignLeft | Wt::AlignmentFlag::AlignMiddle);
     playControlLayout->addWidget(currentTrackDetails);
 }
 
diff --git a/src/ui/PlayerInterface.h b/src/ui/PlayerInterface.h
index 7bd14bc..e672a58 100644
--- a/src/ui/PlayerInterface.h
+++ b/src/ui/PlayerInterface.h
@@ -38,6 +38,7 @@ public:
     
     Wt::WVBoxLayout* interfaceLayout;
     Wt::WHBoxLayout* playControlLayout;
+    Wt::WContainerWidget* playControlWidget;
     Wt::WVBoxLayout* voteControlLayout;
     
     //Play controls
diff --git a/src/ui/TrackDetails.cpp b/src/ui/TrackDetails.cpp
index f44b496..8ad7d77 100644
--- a/src/ui/TrackDetails.cpp
+++ b/src/ui/TrackDetails.cpp
@@ -19,26 +19,32 @@
 
 #include "TrackDetails.h"
 #include <Wt/WLength>
+#include <Wt/WCssDecorationStyle>
 
 TrackDetails::TrackDetails()
 {
+    this->setMaximumSize(Wt::WLength(600, Wt::WLength::Pixel),Wt::WLength(200, Wt::WLength::Pixel));
+    this->decorationStyle().setBorder(Wt::WBorder::Ridge);
+    this->decorationStyle().setBackgroundColor(Wt::WColor("#6FFF6F"));
     mainLayout = new Wt::WHBoxLayout();
     this->setLayout(mainLayout);
-    metaContainer = new Wt::WContainerWidget();
     metaLayout = new Wt::WVBoxLayout();
-    metaContainer->setLayout(metaLayout);
     coverData = new Wt::WMemoryResource();
     albumCover = new Wt::WImage();
     albumCover->setMinimumSize(Wt::WLength(100,Wt::WLength::Pixel),Wt::WLength(100,Wt::WLength::Pixel));
     albumCover->setMaximumSize(Wt::WLength(200,Wt::WLength::Pixel),Wt::WLength(200,Wt::WLength::Pixel));
     mainLayout->addWidget(albumCover);
-    mainLayout->addWidget(metaContainer);
+    mainLayout->addSpacing(Wt::WLength(20, Wt::WLength::Pixel));
+    mainLayout->addLayout(metaLayout);
     trackTitle = new Wt::WText();
+    trackTitle->decorationStyle().setTextDecoration(Wt::WCssDecorationStyle::Underline);
+    trackTitle->decorationStyle().font().setSize(Wt::WFont::Size::Large);
+    trackTitle->decorationStyle().font().setWeight(Wt::WFont::Weight::Bold);
     trackArtist = new Wt::WText();
     trackAlbum = new Wt::WText();
-    metaLayout->addWidget(trackTitle);
-    metaLayout->addWidget(trackArtist);
-    metaLayout->addWidget(trackAlbum);
+    metaLayout->addWidget(trackTitle,2);
+    metaLayout->addWidget(trackAlbum,1,Wt::AlignmentFlag::AlignBottom);
+    metaLayout->addWidget(trackArtist,1,Wt::AlignmentFlag::AlignBottom);
 }
 
 void TrackDetails::updateWithTrackDetails(AudioTrack track)
diff --git a/src/ui/TrackDetails.h b/src/ui/TrackDetails.h
index 08c37b5..f7baf54 100644
--- a/src/ui/TrackDetails.h
+++ b/src/ui/TrackDetails.h
@@ -33,7 +33,6 @@ class TrackDetails : public Wt::WContainerWidget
 public:
     TrackDetails();
     Wt::WHBoxLayout* mainLayout;
-    Wt::WContainerWidget* metaContainer;
     Wt::WVBoxLayout* metaLayout;
     
     Wt::WImage* albumCover;
-- 
GitLab