From 3992cea08408f4529279b39837bd0a9ede69862c Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 9 Oct 2018 13:27:18 +0300 Subject: [PATCH] Draw map point on HistoryLocation. --- Telegram/Resources/icons/map_point.png | Bin 0 -> 941 bytes Telegram/Resources/icons/map_point@2x.png | Bin 0 -> 1989 bytes Telegram/SourceFiles/history/history.style | 2 ++ .../SourceFiles/history/history_media_types.cpp | 8 ++++++++ 4 files changed, 10 insertions(+) create mode 100644 Telegram/Resources/icons/map_point.png create mode 100644 Telegram/Resources/icons/map_point@2x.png diff --git a/Telegram/Resources/icons/map_point.png b/Telegram/Resources/icons/map_point.png new file mode 100644 index 0000000000000000000000000000000000000000..5fdbbbed46a9c7928f8531ab7ee6e8f4868ee6c7 GIT binary patch literal 941 zcmV;e15*5nP)_(rzz^y0>J)h zh&tIVKTYsmzd(Na1@co&=;T-onx;Wf6iAYUQmF*fG*PWqg`mp#yA}l+vMf_3lObK# zsaP!1cNL38%4V~a$z({D<-mFWjWQF^+}s>lmel~^rR(c!nw^~uA1IMXP(Ggz4Dwxu zVUVII;Q*RK9BnWjm}WKs;Mt*wnr(-ekrbaiz_t*x#6K)SAn2IFXBV}lQ9baXUy z7)K)`BkVvYCnu2s9UUF90SyccLA?CfNBs8lLpb8|BsOX{?~zK%+z(sYhz`;kheLU(9rXh^JMyu7>&4d&wF z!nb4eeJ)#ASYRkfbIs4s2b$N^Az7B`?d?t2ol2$R*S-dG=>7dYlqFzgWd*fbEzn%w z$DlA8ww|6IKX-y%)Xq3OJmiMS=kq~e*np;{rnrI9>2&x&0OD!R zxm@;zd3t&xNs^d>nBOs0t5xW_?mKU7Z4E@knjQe7LjY)eeB9TeR4T>l4qwTf@$m5A z33GFE!vn)tGDpq2$!s>un-&14L+Nzd)1k4kF>Z&rf!f>K>E-360p{`Xkrzg+WFH?N z$mMbk@!j2B-jo0Yw-$DGb{b+^TU#P20dSTK0BM@mP_pjsZlRJ10Rf=%^Ybs5)6-KC z7_n=}kzp8LzxVd`MAM0HPt^k*92|(I10Yzkcs%}9vaYT!;gSjMmjQrn+pujLudlCo zets5BC$@p-s8A>fZ`wJEA%w3Qa=9FLtMN^72_bxHp=lb32$p4u0@;56GXTURl|RBl P00000NkvXXu0mjfEQq{H literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/map_point@2x.png b/Telegram/Resources/icons/map_point@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1f0a03e44285fea7cb69049262b6cc35d6e17452 GIT binary patch literal 1989 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 XL#nbj6Vpo~00000NkvXXu0mjfk^|Nx literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style index a4f085cdc..38a12aafb 100644 --- a/Telegram/SourceFiles/history/history.style +++ b/Telegram/SourceFiles/history/history.style @@ -468,3 +468,5 @@ historyAboutProxy: FlatLabel(defaultFlatLabel) { textFg: windowSubTextFg; } historyAboutProxyPadding: margins(20px, 10px, 20px, 10px); + +historyMapPoint: icon {{ "map_point", windowBgActive }}; diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp index eb3129317..8f71d883f 100644 --- a/Telegram/SourceFiles/history/history_media_types.cpp +++ b/Telegram/SourceFiles/history/history_media_types.cpp @@ -41,6 +41,7 @@ namespace { constexpr auto kMaxGifForwardedBarLines = 4; constexpr auto kMaxOriginalEntryLines = 8192; +const auto kMapPointFg = QColor(64, 167, 227); using TextState = HistoryView::TextState; @@ -4843,6 +4844,13 @@ void HistoryLocation::draw(Painter &p, const QRect &r, TextSelection selection, } else { App::complexLocationRect(p, rthumb, roundRadius, roundCorners); } + const auto &point = st::historyMapPoint; + point.paint( + p, + rthumb.x() + ((rthumb.width() - point.width()) / 2), + rthumb.y() + (rthumb.height() / 2) - point.height(), + width(), + kMapPointFg); if (selected) { App::complexOverlayRect(p, rthumb, roundRadius, roundCorners); }