diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index b9a5995e53..01ee978deb 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -688,7 +688,7 @@ groupCallMemberRaisedHand: icon {{ "calls/group_calls_raised_hand", groupCallMem groupCallSettings: CallButton(callMicrophoneMute) { button: IconButton(callButton) { iconPosition: point(-1px, 22px); - icon: icon {{ "calls/call_settings", callIconFg }}; + icon: icon {{ "calls/call_settings", groupCallIconFg }}; ripple: RippleAnimation(defaultRippleAnimation) { color: callMuteRipple; } @@ -696,7 +696,7 @@ groupCallSettings: CallButton(callMicrophoneMute) { } groupCallHangup: CallButton(callHangup) { button: IconButton(callButton) { - icon: icon {{ "calls/call_discard", callIconFg }}; + icon: icon {{ "calls/call_discard", groupCallIconFg }}; ripple: RippleAnimation(defaultRippleAnimation) { color: groupCallLeaveBgRipple; } diff --git a/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp b/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp index c7b859fce6..646e496c3b 100644 --- a/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp +++ b/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp @@ -22,6 +22,7 @@ constexpr auto kEnoughLightnessForContrast = 64; const auto kColorizeIgnoredKeys = base::flat_set{ { qstr("boxTextFgGood"), qstr("boxTextFgError"), + qstr("callIconFg"), qstr("historyPeer1NameFg"), qstr("historyPeer1NameFgSelected"), qstr("historyPeer1UserpicBg"), @@ -143,7 +144,9 @@ Colorizer ColorizerFrom(const EmbeddedScheme &scheme, const QColor &color) { { qstr("activeButtonFg"), Pair{ cColor("2da192"), cColor("282e33") } }, // activeButtonBg, windowBg { qstr("profileVerifiedCheckFg"), Pair{ cColor("3fc1b0"), cColor("282e33") } }, // profileVerifiedCheckBg, windowBg { qstr("overviewCheckFgActive"), Pair{ cColor("3fc1b0"), cColor("282e33") } }, // overviewCheckBgActive - { qstr("callIconFg"), Pair{ cColor("5ad1c1"), cColor("1b1f23") } }, // callAnswerBg, callBgOpaque + // callIconFg is used not only over callAnswerBg, + // so this contrast-forcing breaks other buttons. + //{ qstr("callIconFg"), Pair{ cColor("5ad1c1"), cColor("1b1f23") } }, // callAnswerBg, callBgOpaque } }; result.lightnessMin = 64; break; diff --git a/Telegram/lib_lottie b/Telegram/lib_lottie index d1b9d1dc9f..475d43337a 160000 --- a/Telegram/lib_lottie +++ b/Telegram/lib_lottie @@ -1 +1 @@ -Subproject commit d1b9d1dc9fa3c8f6ef0c93dfb8406f242fdc4950 +Subproject commit 475d43337a3b397e2c9f6e975929ae15695aa346