haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 06:58:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-07-07 15:25:09 +10:00
parent f68ba8c374
commit 79133e766a
4 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
net-im/telegram-desktop/patches/telegram_desktop-1.7.12-libtgvoip.patchset → net-im/telegram-desktop/patches/telegram_desktop-1.7.13-libtgvoip.patchset
View File

0
net-im/telegram-desktop/patches/telegram_desktop-1.7.12-systemqt.patch → net-im/telegram-desktop/patches/telegram_desktop-1.7.13-systemqt.patch
View File

57
net-im/telegram-desktop/patches/telegram_desktop-1.7.12.patchset → net-im/telegram-desktop/patches/telegram_desktop-1.7.13.patchset
View File

@@ -1,4 +1,4 @@
From 4ac3bdd0d3e21e77669b793df650c4ffe9054772 Mon Sep 17 00:00:00 2001
From d5b38f31bf6d49109e0d38294c4ef39862a3498b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 5 Jul 2019 20:52:58 +1000
Subject: Add Haiku support
@@ -2725,7 +2725,7 @@ index bd46332..d85a403 100644
2.21.0
From e98a6bd4bb76fb5b887f6ddff825449d496b434f Mon Sep 17 00:00:00 2001
From c9e31c84291708d4b2409a657d5714016eb4e114 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 6 Jul 2019 22:26:25 +1000
Subject: Disable static Qt for Haiku
@@ -2748,7 +2748,7 @@ index 4d3a7ab..eae76f9 100644
2.21.0
From 47d47c353658f84b5b9c0a4e5b5540d327755173 Mon Sep 17 00:00:00 2001
From d400900e2ed7ed82d91170a75bd8858b70678550 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 6 Jul 2019 22:27:19 +1000
Subject: Add UseMainQueueGeneric function for Haiku backend
@@ -2773,7 +2773,7 @@ index 6788e70..3995ab2 100644
2.21.0
From 29943f5a358dd30a074c9bf0b979f6025a3922da Mon Sep 17 00:00:00 2001
From 20c7a1805bfd7bbddf95da4146a6a456fa27d254 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 6 Jul 2019 22:27:58 +1000
Subject: Fixes for Qt 5.13
@@ -2856,3 +2856,52 @@ index 5d0e509..df3e17c 100644
--
2.21.0
From 6691adf6671efbd82aa73cd95817115f0b7cfc1e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 7 Jul 2019 15:02:46 +1000
Subject: Don't use depricated Qt 5.13 API
diff --git a/Telegram/SourceFiles/ui/style/style_core_font.h b/Telegram/SourceFiles/ui/style/style_core_font.h
index 566a4fe..0864fe7 100644
--- a/Telegram/SourceFiles/ui/style/style_core_font.h
+++ b/Telegram/SourceFiles/ui/style/style_core_font.h
@@ -65,13 +65,13 @@ class FontData {
public:
int32 width(const QString &str) const {
- return m.width(str);
+ return m.horizontalAdvance(str);
}
int32 width(const QString &str, int32 from, int32 to) const {
return width(str.mid(from, to));
}
int32 width(QChar ch) const {
- return m.width(ch);
+ return m.horizontalAdvance(ch);
}
QString elided(const QString &str, int32 width, Qt::TextElideMode mode = Qt::ElideRight) const {
return m.elidedText(str, mode, width);
diff --git a/Telegram/SourceFiles/ui/twidget.h b/Telegram/SourceFiles/ui/twidget.h
index 6202dc7..1325c7b 100644
--- a/Telegram/SourceFiles/ui/twidget.h
+++ b/Telegram/SourceFiles/ui/twidget.h
@@ -140,12 +140,12 @@ public:
void drawTextLeft(int x, int y, int outerw, const QString &text, int textWidth = -1) {
QFontMetrics m(fontMetrics());
- if (rtl() && textWidth < 0) textWidth = m.width(text);
+ if (rtl() && textWidth < 0) textWidth = m.horizontalAdvance(text);
drawText(rtl() ? (outerw - x - textWidth) : x, y + m.ascent(), text);
}
void drawTextRight(int x, int y, int outerw, const QString &text, int textWidth = -1) {
QFontMetrics m(fontMetrics());
- if (!rtl() && textWidth < 0) textWidth = m.width(text);
+ if (!rtl() && textWidth < 0) textWidth = m.horizontalAdvance(text);
drawText(rtl() ? x : (outerw - x - textWidth), y + m.ascent(), text);
}
void drawPixmapLeft(int x, int y, int outerw, const QPixmap &pix, const QRect &from) {
--
2.21.0