diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index fc254f063..4b5b8d05c 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -463,7 +463,6 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
// Now playing widget
ui_->now_playing->set_network(network);
ui_->now_playing->set_ideal_height(ui_->status_bar->sizeHint().height() +
- ui_->status_bar_line->sizeHint().height() +
ui_->player_controls->sizeHint().height() +
1); // Don't question the 1
connect(playlists_, SIGNAL(CurrentSongChanged(Song)), ui_->now_playing, SLOT(NowPlaying(Song)));
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index 847b01082..6be7fe59f 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -41,7 +41,7 @@
QTabWidget::North
- 0
+ 2
false
diff --git a/src/widgets/nowplayingwidget.cpp b/src/widgets/nowplayingwidget.cpp
index c92344dbe..8bc4bd45d 100644
--- a/src/widgets/nowplayingwidget.cpp
+++ b/src/widgets/nowplayingwidget.cpp
@@ -30,7 +30,7 @@
const char* NowPlayingWidget::kSettingsGroup = "NowPlayingWidget";
// Space between the cover and the details in small mode
-const int NowPlayingWidget::kPadding = 4;
+const int NowPlayingWidget::kPadding = 2;
// Width of the transparent to black gradient above and below the text in large
// mode
@@ -42,6 +42,9 @@ const int NowPlayingWidget::kGradientTail = 20;
const int NowPlayingWidget::kMaxCoverSize = 260;
const int NowPlayingWidget::kBottomOffset = 0;
+// Border for large mode
+const int NowPlayingWidget::kTopBorder = 4;
+
NowPlayingWidget::NowPlayingWidget(QWidget *parent)
: QWidget(parent),
@@ -126,7 +129,7 @@ void NowPlayingWidget::UpdateHeight() {
case LargeSongDetails:
cover_height_ = qMin(kMaxCoverSize, width());
- total_height_ = cover_height_ + kBottomOffset;
+ total_height_ = kTopBorder + cover_height_ + kBottomOffset;
break;
}
@@ -256,10 +259,10 @@ void NowPlayingWidget::DrawContents(QPainter *p) {
const int x_offset = (width() - cover_height_) / 2;
// Draw the black background
- p->fillRect(rect(), Qt::black);
+ p->fillRect(QRect(0, kTopBorder, width(), height() - kTopBorder), Qt::black);
// Draw the cover
- p->drawPixmap(x_offset, 0, total_size, total_size, cover_);
+ p->drawPixmap(x_offset, kTopBorder, total_size, total_size, cover_);
// Work out how high the text is going to be
const int text_height = details_->size().height();
diff --git a/src/widgets/nowplayingwidget.h b/src/widgets/nowplayingwidget.h
index f1750ed49..93988d351 100644
--- a/src/widgets/nowplayingwidget.h
+++ b/src/widgets/nowplayingwidget.h
@@ -43,6 +43,7 @@ public:
static const int kGradientTail;
static const int kMaxCoverSize;
static const int kBottomOffset;
+ static const int kTopBorder;
// Values are saved in QSettings
enum Mode {