Improve some confcall graphics.

This commit is contained in:
John Preston 2025-03-31 22:52:23 +05:00
parent a5f44b3ed6
commit 01a6b432f3
12 changed files with 20 additions and 12 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 721 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 956 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -4757,7 +4757,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_group_call_invite" = "Invite Members"; "lng_group_call_invite" = "Invite Members";
"lng_group_call_invite_conf" = "Add People"; "lng_group_call_invite_conf" = "Add People";
"lng_group_call_invited_status" = "invited"; "lng_group_call_invited_status" = "invited";
"lng_group_call_blockchain_only_status" = "syncing..."; "lng_group_call_blockchain_only_status" = "listening";
"lng_group_call_muted_by_me_status" = "muted for you"; "lng_group_call_muted_by_me_status" = "muted for you";
"lng_group_call_invite_title" = "Invite members"; "lng_group_call_invite_title" = "Invite members";
"lng_group_call_invite_button" = "Invite"; "lng_group_call_invite_button" = "Invite";

View file

@ -132,7 +132,6 @@ callHangup: CallButton(callAnswer) {
} }
bg: callHangupBg; bg: callHangupBg;
outerBg: callHangupBg; outerBg: callHangupBg;
label: callButtonLabel;
} }
callCancel: CallButton(callAnswer) { callCancel: CallButton(callAnswer) {
button: IconButton(callButton) { button: IconButton(callButton) {
@ -143,7 +142,6 @@ callCancel: CallButton(callAnswer) {
} }
bg: callIconBgActive; bg: callIconBgActive;
outerBg: callIconBgActive; outerBg: callIconBgActive;
label: callButtonLabel;
} }
callMicrophoneMute: CallButton(callAnswer) { callMicrophoneMute: CallButton(callAnswer) {
button: IconButton(callButton) { button: IconButton(callButton) {
@ -154,7 +152,6 @@ callMicrophoneMute: CallButton(callAnswer) {
} }
bg: callIconBg; bg: callIconBg;
outerBg: callMuteRipple; outerBg: callMuteRipple;
label: callButtonLabel;
cornerButtonPosition: point(40px, 4px); cornerButtonPosition: point(40px, 4px);
cornerButtonBorder: 2px; cornerButtonBorder: 2px;
} }
@ -185,15 +182,14 @@ callCameraUnmute: CallButton(callMicrophoneUnmute) {
} }
callAddPeople: CallButton(callAnswer) { callAddPeople: CallButton(callAnswer) {
button: IconButton(callButton) { button: IconButton(callButton) {
icon: icon {{ "settings/group", callIconFgActive }}; icon: icon {{ "calls/calls_add_people", callIconFg }};
iconPosition: point(-1px, 24px); iconPosition: point(-1px, 22px);
ripple: RippleAnimation(defaultRippleAnimation) { ripple: RippleAnimation(defaultRippleAnimation) {
color: callIconActiveRipple; color: callMuteRipple;
} }
} }
bg: callIconBgActive; bg: callIconBg;
outerBg: callIconBgActive; outerBg: callMuteRipple;
label: callButtonLabel;
} }
callCornerButtonInner: IconButton { callCornerButtonInner: IconButton {
width: 20px; width: 20px;
@ -930,7 +926,6 @@ groupCallHangup: CallButton(callHangup) {
button: groupCallHangupInner; button: groupCallHangupInner;
bg: groupCallLeaveBg; bg: groupCallLeaveBg;
outerBg: groupCallLeaveBg; outerBg: groupCallLeaveBg;
label: callButtonLabel;
} }
groupCallSettingsSmall: CallButton(groupCallSettings) { groupCallSettingsSmall: CallButton(groupCallSettings) {
button: IconButton(groupCallSettingsInner) { button: IconButton(groupCallSettingsInner) {

View file

@ -116,7 +116,9 @@ void Call::draw(Painter &p, const PaintContext &context) const {
p.setPen(stm->mediaFg); p.setPen(stm->mediaFg);
p.drawTextLeft(statusleft, statustop, paintw, _status); p.drawTextLeft(statusleft, statustop, paintw, _status);
const auto &icon = _video const auto &icon = _conference
? stm->historyCallGroupIcon
: _video
? stm->historyCallCameraIcon ? stm->historyCallCameraIcon
: stm->historyCallIcon; : stm->historyCallIcon;
icon.paint(p, paintw - st::historyCallIconPosition.x() - icon.width(), st::historyCallIconPosition.y() - topMinus, paintw); icon.paint(p, paintw - st::historyCallIconPosition.x() - icon.width(), st::historyCallIconPosition.y() - topMinus, paintw);

View file

@ -437,6 +437,10 @@ historyCallCameraInIcon: icon {{ "calls/call_camera_active", msgFileInBg }};
historyCallCameraInIconSelected: icon {{ "calls/call_camera_active", msgFileInBgSelected }}; historyCallCameraInIconSelected: icon {{ "calls/call_camera_active", msgFileInBgSelected }};
historyCallCameraOutIcon: icon {{ "calls/call_camera_active", msgFileOutBg }}; historyCallCameraOutIcon: icon {{ "calls/call_camera_active", msgFileOutBg }};
historyCallCameraOutIconSelected: icon {{ "calls/call_camera_active", msgFileOutBgSelected }}; historyCallCameraOutIconSelected: icon {{ "calls/call_camera_active", msgFileOutBgSelected }};
historyCallGroupInIcon: icon {{ "calls/call_group", msgFileInBg }};
historyCallGroupInIconSelected: icon {{ "calls/call_group", msgFileInBgSelected }};
historyCallGroupOutIcon: icon {{ "calls/call_group", msgFileOutBg }};
historyCallGroupOutIconSelected: icon {{ "calls/call_group", msgFileOutBgSelected }};
historyCallIconPosition: point(12px, 10px); historyCallIconPosition: point(12px, 10px);
historyCallLeft: 16px; historyCallLeft: 16px;
historyCallTop: 9px; historyCallTop: 9px;

View file

@ -387,6 +387,12 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
st::historyCallCameraInIconSelected, st::historyCallCameraInIconSelected,
st::historyCallCameraOutIcon, st::historyCallCameraOutIcon,
st::historyCallCameraOutIconSelected); st::historyCallCameraOutIconSelected);
make(
&MessageStyle::historyCallGroupIcon,
st::historyCallGroupInIcon,
st::historyCallGroupInIconSelected,
st::historyCallGroupOutIcon,
st::historyCallGroupOutIconSelected);
make( make(
&MessageStyle::historyFilePlay, &MessageStyle::historyFilePlay,
st::historyFileInPlay, st::historyFileInPlay,

View file

@ -76,6 +76,7 @@ struct MessageStyle {
style::icon historyCallArrowMissed = { Qt::Uninitialized }; style::icon historyCallArrowMissed = { Qt::Uninitialized };
style::icon historyCallIcon = { Qt::Uninitialized }; style::icon historyCallIcon = { Qt::Uninitialized };
style::icon historyCallCameraIcon = { Qt::Uninitialized }; style::icon historyCallCameraIcon = { Qt::Uninitialized };
style::icon historyCallGroupIcon = { Qt::Uninitialized };
style::icon historyFilePlay = { Qt::Uninitialized }; style::icon historyFilePlay = { Qt::Uninitialized };
style::icon historyFileWaiting = { Qt::Uninitialized }; style::icon historyFileWaiting = { Qt::Uninitialized };
style::icon historyFileDownload = { Qt::Uninitialized }; style::icon historyFileDownload = { Qt::Uninitialized };