procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix invoice amount display.

This commit is contained in:
John Preston 2017-11-05 21:40:16 +04:00
parent 554eb3a342
commit 9c01bbca95
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/SourceFiles/history/history_media_types.cpp
View File

@ -4225,14 +4225,20 @@ int HistoryGame::bottomInfoPadding() const {
return result; return result;
} }
HistoryInvoice::HistoryInvoice(not_null<HistoryItem*> parent, const MTPDmessageMediaInvoice &data) : HistoryMedia(parent) HistoryInvoice::HistoryInvoice(
not_null<HistoryItem*> parent,
const MTPDmessageMediaInvoice &data)
: HistoryMedia(parent)
, _title(st::msgMinWidth) , _title(st::msgMinWidth)
, _description(st::msgMinWidth) , _description(st::msgMinWidth)
, _status(st::msgMinWidth) { , _status(st::msgMinWidth) {
fillFromData(data); fillFromData(data);
} }
HistoryInvoice::HistoryInvoice(not_null<HistoryItem*> parent, const HistoryInvoice &other) : HistoryMedia(parent) HistoryInvoice::HistoryInvoice(
not_null<HistoryItem*> parent,
const HistoryInvoice &other)
: HistoryMedia(parent)
, _attach(other._attach ? other._attach->clone(parent) : nullptr) , _attach(other._attach ? other._attach->clone(parent) : nullptr)
, _titleHeight(other._titleHeight) , _titleHeight(other._titleHeight)
, _descriptionHeight(other._descriptionHeight) , _descriptionHeight(other._descriptionHeight)
@ -4241,7 +4247,7 @@ HistoryInvoice::HistoryInvoice(not_null<HistoryItem*> parent, const HistoryInvoi
, _status(other._status) { , _status(other._status) {
} }
QString HistoryInvoice::fillAmountAndCurrency(int amount, const QString &currency) { QString HistoryInvoice::fillAmountAndCurrency(uint64 amount, const QString &currency) {
static auto shortCurrencyNames = QMap<QString, QString> { static auto shortCurrencyNames = QMap<QString, QString> {
{ qsl("USD"), QString::fromUtf8("\x24") }, { qsl("USD"), QString::fromUtf8("\x24") },
{ qsl("GBP"), QString::fromUtf8("\xC2\xA3") }, { qsl("GBP"), QString::fromUtf8("\xC2\xA3") },
@ -4285,7 +4291,6 @@ void HistoryInvoice::fillFromData(const MTPDmessageMediaInvoice &data) {
_attach = std::make_unique<HistoryPhoto>(_parent, photo, QString()); _attach = std::make_unique<HistoryPhoto>(_parent, photo, QString());
} }
} }
auto labelText = [&data] { auto labelText = [&data] {
if (data.has_receipt_msg_id()) { if (data.has_receipt_msg_id()) {
if (data.is_test()) { if (data.is_test()) {
@ -4297,7 +4302,10 @@ void HistoryInvoice::fillFromData(const MTPDmessageMediaInvoice &data) {
} }
return lang(lng_payments_invoice_label); return lang(lng_payments_invoice_label);
}; };
auto statusText = TextWithEntities { fillAmountAndCurrency(data.vtotal_amount.v, qs(data.vcurrency)), EntitiesInText() }; auto statusText = TextWithEntities {
fillAmountAndCurrency(data.vtotal_amount.v, qs(data.vcurrency)),
EntitiesInText()
};
statusText.entities.push_back(EntityInText(EntityInTextBold, 0, statusText.text.size())); statusText.entities.push_back(EntityInText(EntityInTextBold, 0, statusText.text.size()));
statusText.text += ' ' + labelText().toUpper(); statusText.text += ' ' + labelText().toUpper();
_status.setMarkedText(st::defaultTextStyle, statusText, itemTextOptions(_parent)); _status.setMarkedText(st::defaultTextStyle, statusText, itemTextOptions(_parent));

2
Telegram/SourceFiles/history/history_media_types.h
View File

@ -1023,7 +1023,7 @@ public:
QString getTitle() const { QString getTitle() const {
return _title.originalText(); return _title.originalText();
} }
static QString fillAmountAndCurrency(int amount, const QString &currency); static QString fillAmountAndCurrency(uint64 amount, const QString &currency);
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override; void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override; HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;