From c58df19b93d552ef4b7f22f31a9a5e69875eadb0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 15 Jan 2017 16:12:35 +0300
Subject: [PATCH] Fix popup menu rendering in OS X 10.6-10.7. #2839

---
 Telegram/SourceFiles/ui/widgets/popup_menu.cpp | 6 ++++++
 Telegram/SourceFiles/ui/widgets/tooltip.cpp    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp
index c4430f9ba..055e38a95 100644
--- a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp
+++ b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp
@@ -107,6 +107,12 @@ PopupMenu::Actions &PopupMenu::actions() {
 void PopupMenu::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
+#ifdef OS_MAC_OLD
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	p.fillRect(e->rect(), Qt::transparent);
+	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+#endif // OS_MAC_OLD
+
 	auto ms = getms();
 	if (_a_show.animating(ms)) {
 		if (auto opacity = _a_opacity.current(ms, _hiding ? 0. : 1.)) {
diff --git a/Telegram/SourceFiles/ui/widgets/tooltip.cpp b/Telegram/SourceFiles/ui/widgets/tooltip.cpp
index 53648252f..53ffe0b39 100644
--- a/Telegram/SourceFiles/ui/widgets/tooltip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/tooltip.cpp
@@ -156,6 +156,12 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *
 void Tooltip::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
+#ifdef OS_MAC_OLD
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	p.fillRect(e->rect(), Qt::transparent);
+	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+#endif // OS_MAC_OLD
+
 	if (_useTransparency) {
 		p.setPen(_st->textBorder);
 		p.setBrush(_st->textBg);