From 24f72dee3337b20e30f97e1c0d5f7bd2c6501be6 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 10 Nov 2023 10:20:52 +0100
Subject: [PATCH] elide notifications title!

---
 .../gui/notifications/articlelistnotification.cpp      |  1 +
 .../gui/notifications/articlelistnotification.ui       | 10 ++++++----
 .../gui/notifications/toastnotification.cpp            |  3 +++
 src/librssguard/gui/notifications/toastnotification.ui | 10 ++++++----
 src/librssguard/gui/reusable/squeezelabel.cpp          |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/librssguard/gui/notifications/articlelistnotification.cpp b/src/librssguard/gui/notifications/articlelistnotification.cpp
index f01d2648a..f87941367 100644
--- a/src/librssguard/gui/notifications/articlelistnotification.cpp
+++ b/src/librssguard/gui/notifications/articlelistnotification.cpp
@@ -71,6 +71,7 @@ void ArticleListNotification::loadResults(const QHash<Feed*, QList<Message>>& ne
   m_newMessages = new_messages;
 
   m_ui.m_lblTitle->setText(tr("%n feeds fetched", nullptr, new_messages.size()));
+  m_ui.m_lblTitle->setToolTip(m_ui.m_lblTitle->text());
 
   m_ui.m_cmbFeeds->model()->sort(0, Qt::SortOrder::AscendingOrder);
   m_ui.m_cmbFeeds->clear();
diff --git a/src/librssguard/gui/notifications/articlelistnotification.ui b/src/librssguard/gui/notifications/articlelistnotification.ui
index bcbaa5d63..d8a457577 100644
--- a/src/librssguard/gui/notifications/articlelistnotification.ui
+++ b/src/librssguard/gui/notifications/articlelistnotification.ui
@@ -51,16 +51,13 @@
    <item row="0" column="0" colspan="2">
     <layout class="QHBoxLayout" name="m_titleLayout">
      <item>
-      <widget class="QLabel" name="m_lblTitle">
+      <widget class="SqueezeLabel" name="m_lblTitle">
        <property name="text">
         <string/>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
      <item>
@@ -136,6 +133,11 @@
    <extends>QToolButton</extends>
    <header>plaintoolbutton.h</header>
   </customwidget>
+  <customwidget>
+   <class>SqueezeLabel</class>
+   <extends>QLabel</extends>
+   <header>squeezelabel.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_btnClose</tabstop>
diff --git a/src/librssguard/gui/notifications/toastnotification.cpp b/src/librssguard/gui/notifications/toastnotification.cpp
index 1062c82e6..607387c6f 100644
--- a/src/librssguard/gui/notifications/toastnotification.cpp
+++ b/src/librssguard/gui/notifications/toastnotification.cpp
@@ -24,7 +24,9 @@ ToastNotification::ToastNotification(Notification::Event event,
 
 void ToastNotification::loadNotification(Notification::Event event, const GuiMessage& msg, const GuiAction& action) {
   m_ui.m_lblTitle->setText(msg.m_title);
+  m_ui.m_lblTitle->setToolTip(msg.m_title);
   m_ui.m_lblBody->setText(msg.m_message);
+  m_ui.m_lblBody->setToolTip(msg.m_message);
 
   m_ui.m_lblIcon->setPixmap(iconForType(msg.m_type)
                               .pixmap({
@@ -41,6 +43,7 @@ void ToastNotification::loadNotification(Notification::Event event, const GuiMes
   }
   else {
     m_ui.m_mainLayout->removeItem(m_ui.m_actionLayout);
+    m_ui.m_mainLayout->update();
     m_ui.m_btnAction->deleteLater();
   }
 }
diff --git a/src/librssguard/gui/notifications/toastnotification.ui b/src/librssguard/gui/notifications/toastnotification.ui
index 43ef64cb9..2f7448565 100644
--- a/src/librssguard/gui/notifications/toastnotification.ui
+++ b/src/librssguard/gui/notifications/toastnotification.ui
@@ -26,16 +26,13 @@
    <item row="0" column="0" colspan="2">
     <layout class="QHBoxLayout" name="m_titleLayout">
      <item>
-      <widget class="QLabel" name="m_lblTitle">
+      <widget class="SqueezeLabel" name="m_lblTitle">
        <property name="text">
         <string/>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
      <item>
@@ -100,6 +97,11 @@
    <extends>QToolButton</extends>
    <header>plaintoolbutton.h</header>
   </customwidget>
+  <customwidget>
+   <class>SqueezeLabel</class>
+   <extends>QLabel</extends>
+   <header>squeezelabel.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/librssguard/gui/reusable/squeezelabel.cpp b/src/librssguard/gui/reusable/squeezelabel.cpp
index 35cd90f23..af2e16ebb 100644
--- a/src/librssguard/gui/reusable/squeezelabel.cpp
+++ b/src/librssguard/gui/reusable/squeezelabel.cpp
@@ -10,7 +10,7 @@ void SqueezeLabel::paintEvent(QPaintEvent* event) {
     QFontMetrics fm = fontMetrics();
 
     if (fm.horizontalAdvance(m_squeezedTextCache) > contentsRect().width()) {
-      setText(fm.elidedText(text(), Qt::ElideMiddle, width()));
+      setText(fm.elidedText(text(), Qt::TextElideMode::ElideRight, width()));
     }
   }