From 11f01947a76909a24b6d71f64b59fe6448afb476 Mon Sep 17 00:00:00 2001
From: ckath <ckat@teknik.io>
Date: Fri, 14 Dec 2018 22:40:56 +0100
Subject: [PATCH 1/3] stop emotes from being cut off

---
 src/messages/layouts/MessageLayoutContainer.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index f24d05e26..c2b43f357 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -157,7 +157,7 @@ void MessageLayoutContainer::breakLine()
         int yExtra = 0;
         if (isCompactEmote)
         {
-            // yExtra = (COMPACT_EMOTES_OFFSET / 2) * this->scale_;
+            yExtra = (COMPACT_EMOTES_OFFSET / 2) * this->scale_;
         }
 
         //        if (element->getCreator().getFlags() &
@@ -165,8 +165,7 @@ void MessageLayoutContainer::breakLine()
         //        {
         if (element->getRect().height() < this->textLineHeight_)
         {
-            // yExtra -= (this->textLineHeight_ - element->getRect().height()) /
-            // 2;
+            yExtra -= (this->textLineHeight_ - element->getRect().height()) / 2;
         }
 
         element->setPosition(

From 1c8373432ce5d7ab4e0ff3dcef7c3fd5ddb7e172 Mon Sep 17 00:00:00 2001
From: ckath <ckat@teknik.io>
Date: Sat, 23 Mar 2019 23:49:55 +0100
Subject: [PATCH 2/3] but dont fuck up the (dis/re)connected messages

---
 src/messages/layouts/MessageLayoutContainer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index c2b43f357..3c852a29d 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -165,7 +165,7 @@ void MessageLayoutContainer::breakLine()
         //        {
         if (element->getRect().height() < this->textLineHeight_)
         {
-            yExtra -= (this->textLineHeight_ - element->getRect().height()) / 2;
+            //yExtra -= (this->textLineHeight_ - element->getRect().height()) / 2;
         }
 
         element->setPosition(

From b49c21a515806081ae6e13a8e7990296603c72cb Mon Sep 17 00:00:00 2001
From: ckath <ckat@teknik.io>
Date: Sat, 23 Mar 2019 23:55:11 +0100
Subject: [PATCH 3/3] change comment to original so it doesnt cause a change

---
 src/messages/layouts/MessageLayoutContainer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index 3c852a29d..f421b053a 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -165,7 +165,8 @@ void MessageLayoutContainer::breakLine()
         //        {
         if (element->getRect().height() < this->textLineHeight_)
         {
-            //yExtra -= (this->textLineHeight_ - element->getRect().height()) / 2;
+            // yExtra -= (this->textLineHeight_ - element->getRect().height()) /
+            // 2;
         }
 
         element->setPosition(