Merge branch 'games_branch'
This commit is contained in:
commit
79a90956f7
|
@ -83,11 +83,11 @@ void ReportBox::onChange() {
|
||||||
connect(_reasonOtherText, SIGNAL(submitted(bool)), this, SLOT(onReport()));
|
connect(_reasonOtherText, SIGNAL(submitted(bool)), this, SLOT(onReport()));
|
||||||
connect(_reasonOtherText, SIGNAL(cancelled()), this, SLOT(onClose()));
|
connect(_reasonOtherText, SIGNAL(cancelled()), this, SLOT(onClose()));
|
||||||
}
|
}
|
||||||
|
_reasonOtherText->setFocus();
|
||||||
} else if (_reasonOtherText) {
|
} else if (_reasonOtherText) {
|
||||||
_reasonOtherText.destroy();
|
_reasonOtherText.destroy();
|
||||||
updateMaxHeight();
|
updateMaxHeight();
|
||||||
}
|
}
|
||||||
_reasonOtherText->setFocus();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReportBox::doSetInnerFocus() {
|
void ReportBox::doSetInnerFocus() {
|
||||||
|
|
|
@ -2011,10 +2011,11 @@ bool HistoryService::prepareGameScoreText(const QString &from, QString *outText,
|
||||||
} else {
|
} else {
|
||||||
gameTitle = lang(lng_deleted_message);
|
gameTitle = lang(lng_deleted_message);
|
||||||
}
|
}
|
||||||
|
auto scoreNumber = gamescore ? gamescore->score : 0;
|
||||||
if (_from->isSelf()) {
|
if (_from->isSelf()) {
|
||||||
*outText = lng_action_game_you_scored(lt_count, gamescore->score, lt_game, gameTitle);
|
*outText = lng_action_game_you_scored(lt_count, scoreNumber, lt_game, gameTitle);
|
||||||
} else {
|
} else {
|
||||||
*outText = lng_action_game_score(lt_from, from, lt_count, gamescore->score, lt_game, gameTitle);
|
*outText = lng_action_game_score(lt_from, from, lt_count, scoreNumber, lt_game, gameTitle);
|
||||||
}
|
}
|
||||||
if (second) {
|
if (second) {
|
||||||
outLinks->push_back(second);
|
outLinks->push_back(second);
|
||||||
|
@ -2212,12 +2213,13 @@ HistoryTextState HistoryService::getState(int x, int y, HistoryStateRequest requ
|
||||||
}
|
}
|
||||||
|
|
||||||
void HistoryService::createFromMtp(const MTPDmessageService &message) {
|
void HistoryService::createFromMtp(const MTPDmessageService &message) {
|
||||||
|
if (message.vaction.type() == mtpc_messageActionGameScore) {
|
||||||
|
UpdateComponents(HistoryServiceGameScore::Bit());
|
||||||
|
Get<HistoryServiceGameScore>()->score = message.vaction.c_messageActionGameScore().vscore.v;
|
||||||
|
}
|
||||||
if (message.has_reply_to_msg_id()) {
|
if (message.has_reply_to_msg_id()) {
|
||||||
if (message.vaction.type() == mtpc_messageActionPinMessage) {
|
if (message.vaction.type() == mtpc_messageActionPinMessage) {
|
||||||
UpdateComponents(HistoryServicePinned::Bit());
|
UpdateComponents(HistoryServicePinned::Bit());
|
||||||
} else if (message.vaction.type() == mtpc_messageActionGameScore) {
|
|
||||||
UpdateComponents(HistoryServiceGameScore::Bit());
|
|
||||||
Get<HistoryServiceGameScore>()->score = message.vaction.c_messageActionGameScore().vscore.v;
|
|
||||||
}
|
}
|
||||||
if (auto dependent = GetDependentData()) {
|
if (auto dependent = GetDependentData()) {
|
||||||
dependent->msgId = message.vreply_to_msg_id.v;
|
dependent->msgId = message.vreply_to_msg_id.v;
|
||||||
|
|
Loading…
Reference in New Issue