void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added video icon in call row in calls box.

Browse source
This commit is contained in:
23rd 2020-08-15 15:30:21 +03:00
parent 57f8b03949
commit 3d8b691ff9
2 changed files with 46 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Telegram/SourceFiles/calls/calls.style
View file

@ -262,8 +262,8 @@ callReDial: IconButton {
width: 40px; width: 40px;
height: 56px; height: 56px;
icon: mainMenuCalls; icon: icon {{ "call_answer", menuIconFg }};
iconOver: mainMenuCallsOver; iconOver: icon {{ "call_answer", menuIconFgOver }};
iconPosition: point(-1px, -1px); iconPosition: point(-1px, -1px);
ripple: defaultRippleAnimation; ripple: defaultRippleAnimation;
@ -271,6 +271,11 @@ callReDial: IconButton {
rippleAreaSize: 40px; rippleAreaSize: 40px;
} }
callCameraReDial: IconButton(callReDial) {
icon: icon {{ "call_camera_active", menuIconFg }};
iconOver: icon {{ "call_camera_active", menuIconFgOver }};
}
callRatingPadding: margins(24px, 12px, 24px, 0px); callRatingPadding: margins(24px, 12px, 24px, 0px);
callRatingStar: IconButton { callRatingStar: IconButton {
width: 36px; width: 36px;

46
Telegram/SourceFiles/calls/calls_box_controller.cpp
View file

@ -42,6 +42,11 @@ public:
Missed, Missed,
}; };
enum class CallType {
Voice,
Video,
};
bool canAddItem(not_null<const HistoryItem*> item) const { bool canAddItem(not_null<const HistoryItem*> item) const {
return (ComputeType(item) == _type) return (ComputeType(item) == _type)
&& (ItemDateTime(item).date() == _date); && (ItemDateTime(item).date() == _date);
@ -90,7 +95,7 @@ public:
return 0; return 0;
} }
QSize actionSize() const override { QSize actionSize() const override {
return peer()->isUser() ? QSize(st::callReDial.width, st::callReDial.height) : QSize(); return peer()->isUser() ? QSize(_st->width, _st->height) : QSize();
} }
QMargins actionMargins() const override { QMargins actionMargins() const override {
return QMargins( return QMargins(
@ -110,10 +115,12 @@ public:
private: private:
void refreshStatus() override; void refreshStatus() override;
static Type ComputeType(not_null<const HistoryItem*> item); static Type ComputeType(not_null<const HistoryItem*> item);
static CallType ComputeCallType(not_null<const HistoryItem*> item);
std::vector<not_null<HistoryItem*>> _items; std::vector<not_null<HistoryItem*>> _items;
QDate _date; QDate _date;
Type _type; Type _type;
not_null<const style::IconButton*> _st;
std::unique_ptr<Ui::RippleAnimation> _actionRipple; std::unique_ptr<Ui::RippleAnimation> _actionRipple;
@ -123,7 +130,10 @@ BoxController::Row::Row(not_null<HistoryItem*> item)
: PeerListRow(item->history()->peer, item->id) : PeerListRow(item->history()->peer, item->id)
, _items(1, item) , _items(1, item)
, _date(ItemDateTime(item).date()) , _date(ItemDateTime(item).date())
, _type(ComputeType(item)) { , _type(ComputeType(item))
, _st(ComputeCallType(item) == CallType::Voice
? &st::callReDial
: &st::callCameraReDial) {
refreshStatus(); refreshStatus();
} }
@ -153,12 +163,18 @@ void BoxController::Row::paintAction(
bool actionSelected) { bool actionSelected) {
auto size = actionSize(); auto size = actionSize();
if (_actionRipple) { if (_actionRipple) {
_actionRipple->paint(p, x + st::callReDial.rippleAreaPosition.x(), y + st::callReDial.rippleAreaPosition.y(), outerWidth); _actionRipple->paint(
p,
x + _st->rippleAreaPosition.x(),
y + _st->rippleAreaPosition.y(),
outerWidth);
if (_actionRipple->empty()) { if (_actionRipple->empty()) {
_actionRipple.reset(); _actionRipple.reset();
} }
} }
st::callReDial.icon.paintInCenter(p, style::rtlrect(x, y, size.width(), size.height(), outerWidth)); _st->icon.paintInCenter(
p,
style::rtlrect(x, y, size.width(), size.height(), outerWidth));
} }
void BoxController::Row::refreshStatus() { void BoxController::Row::refreshStatus() {
@ -201,12 +217,28 @@ BoxController::Row::Type BoxController::Row::ComputeType(
return Type::In; return Type::In;
} }
BoxController::Row::CallType BoxController::Row::ComputeCallType(
not_null<const HistoryItem*> item) {
if (auto media = item->media()) {
if (const auto call = media->call()) {
if (call->video) {
return CallType::Video;
}
}
}
return CallType::Voice;
}
void BoxController::Row::addActionRipple(QPoint point, Fn<void()> updateCallback) { void BoxController::Row::addActionRipple(QPoint point, Fn<void()> updateCallback) {
if (!_actionRipple) { if (!_actionRipple) {
auto mask = Ui::RippleAnimation::ellipseMask(QSize(st::callReDial.rippleAreaSize, st::callReDial.rippleAreaSize)); auto mask = Ui::RippleAnimation::ellipseMask(
_actionRipple = std::make_unique<Ui::RippleAnimation>(st::callReDial.ripple, std::move(mask), std::move(updateCallback)); QSize(_st->rippleAreaSize, _st->rippleAreaSize));
_actionRipple = std::make_unique<Ui::RippleAnimation>(
_st->ripple,
std::move(mask),
std::move(updateCallback));
} }
_actionRipple->add(point - st::callReDial.rippleAreaPosition); _actionRipple->add(point - _st->rippleAreaPosition);
} }
void BoxController::Row::stopLastActionRipple() { void BoxController::Row::stopLastActionRipple() {