From 1c1302cb66fdb4865719230a4fac867de5890ff3 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Mon, 31 Dec 2018 12:28:16 -0500
Subject: [PATCH] fix presence indicator on account items

Change-Id: Ia3f05f8b6b74fc7fa3f9a5e599b545183dff7dab
---
 accountitemdelegate.cpp    | 12 ++++++------
 currentaccountcombobox.cpp |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/accountitemdelegate.cpp b/accountitemdelegate.cpp
index b5d2827..0465c55 100644
--- a/accountitemdelegate.cpp
+++ b/accountitemdelegate.cpp
@@ -87,15 +87,15 @@ AccountItemDelegate::paint(QPainter* painter,
         QPixmap::fromImage(index.data(AccountListModel::Role::Picture).value<QImage>())
         .scaled(avatarSize_, avatarSize_, Qt::KeepAspectRatio, Qt::SmoothTransformation));
 
-    // Presence indicator
-    QPainterPath outerCircle, innerCircle;
-    QPointF center(rectAvatar.right() - avatarSize_ / 6, (rectAvatar.bottom() - avatarSize_ / 6) + 1);
-    qreal outerCRadius = avatarSize_ / 6, innerCRadius = outerCRadius * 0.85;
-    outerCircle.addEllipse(center, outerCRadius, outerCRadius);
-    innerCircle.addEllipse(center, innerCRadius, innerCRadius);
     auto status = index.data(static_cast<int>(AccountListModel::Role::Status)).value<int>();
     auto isPresent = Utils::toEnum<lrc::api::account::Status>(status) == lrc::api::account::Status::REGISTERED;
+    // Presence indicator
     if (isPresent) {
+        QPainterPath outerCircle, innerCircle;
+        QPointF center(rectAvatar.right() - avatarSize_ / 6, (rectAvatar.bottom() - avatarSize_ / 6) + 1);
+        qreal outerCRadius = avatarSize_ / 6, innerCRadius = outerCRadius * 0.75;
+        outerCircle.addEllipse(center, outerCRadius, outerCRadius);
+        innerCircle.addEllipse(center, innerCRadius, innerCRadius);
         painter->fillPath(outerCircle, Qt::white);
         painter->fillPath(innerCircle, RingTheme::presenceGreen_);
     }
diff --git a/currentaccountcombobox.cpp b/currentaccountcombobox.cpp
index 350fdab..31031c8 100644
--- a/currentaccountcombobox.cpp
+++ b/currentaccountcombobox.cpp
@@ -108,7 +108,7 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
         QPainterPath outerCircle, innerCircle;
         QPointF presenceCenter(40.0 + p.x(), 40.0);
         qreal outerCircleRadius = cellHeight_/6.5;
-        qreal innerCircleRadius = outerCircleRadius - 1;
+        qreal innerCircleRadius = outerCircleRadius * 0.75;
         outerCircle.addEllipse(presenceCenter, outerCircleRadius, outerCircleRadius);
         innerCircle.addEllipse(presenceCenter, innerCircleRadius, innerCircleRadius);
         painter.fillPath(outerCircle, Qt::white);
-- 
GitLab