From e7ef873935bb364d0ff36504bb86fe1729e8bf70 Mon Sep 17 00:00:00 2001 From: AlexeyZavar Date: Thu, 18 Dec 2025 11:48:20 +0300 Subject: [PATCH] chore: revert some style changes --- .../SourceFiles/ayu/utils/telegram_helpers.cpp | 5 ----- Telegram/SourceFiles/boxes/boxes.style | 4 ++-- Telegram/SourceFiles/calls/calls.style | 4 ++-- .../SourceFiles/chat_helpers/chat_helpers.style | 14 +++++++------- Telegram/SourceFiles/dialogs/dialogs.style | 2 +- Telegram/SourceFiles/info/info.style | 2 +- Telegram/SourceFiles/intro/intro.style | 4 ++-- .../SourceFiles/media/player/media_player.style | 4 ++-- Telegram/SourceFiles/media/view/media_view.style | 4 ++-- Telegram/SourceFiles/ui/chat/chat.style | 8 ++++---- Telegram/SourceFiles/ui/effects/premium.style | 2 +- Telegram/SourceFiles/window/window.style | 4 ++-- Telegram/lib_ui | 2 +- 13 files changed, 27 insertions(+), 32 deletions(-) diff --git a/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp b/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp index cf57c9fa0f..71ecd63b89 100644 --- a/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp +++ b/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp @@ -10,8 +10,6 @@ #include #include -#include -#include #include #include @@ -51,15 +49,12 @@ #include "data/stickers/data_custom_emoji.h" #include "data/stickers/data_stickers.h" #include "lang/lang_keys.h" -#include "lang/lang_text_entity.h" #include "main/main_domain.h" #include "styles/style_ayu_styles.h" #include "ui/text/text_utilities.h" #include "ui/text/text_entity.h" #include "ui/toast/toast.h" -#include "unicode/regex.h" - namespace { constexpr auto usernameResolverBotId = 7424190611L; diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 77a7a008ba..49012bac39 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -735,7 +735,7 @@ createPollOptionRemove: CrossButton { crossFgOver: boxTitleCloseFgOver; crossPosition: point(0px, 0px); - duration: 135; + duration: 150; loadingPeriod: 1000; ripple: defaultRippleAnimationBgOver; } @@ -782,7 +782,7 @@ backgroundCheck: ServiceCheck { large: 6px; stroke: 2px; color: msgServiceFg; - duration: 180; + duration: 200; } backgroundConfirmPadding: margins(24px, 16px, 24px, 16px); backgroundConfirm: RoundButton(defaultActiveButton) { diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index a82a2bc620..61f3397e69 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -446,7 +446,7 @@ callDebugPadding: margins(24px, 0px, 24px, 0px); callDebugLabel: FlatLabel(defaultFlatLabel) { margin: callDebugPadding; } -callPanelDuration: 135; +callPanelDuration: 150; callPanelSignalBars: CallSignalBars { width: 2px; @@ -1263,7 +1263,7 @@ groupCallSpeakerArcsAnimation: ArcsAnimation { fg: groupCallIconFg; stroke: 2px; space: 4px; - duration: 180; + duration: 200; deltaAngle: 60; deltaHeight: 6px; deltaWidth: 7px; diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index 92ca9131bd..a15a4e302b 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -424,7 +424,7 @@ stickersScroll: ScrollArea(boxScroll) { deltab: 9px; } stickersRowDisabledOpacity: 0.4; -stickersRowDuration: 180; +stickersRowDuration: 200; emojiStatusDefault: icon {{ "emoji/stickers_premium", emojiIconFg }}; @@ -445,10 +445,10 @@ emojiPanWidth: 345px; emojiPanMinHeight: 278px; emojiPanMaxHeight: 640px; emojiPanHeightRatio: 0.75; -emojiPanShowDuration: 180; -emojiPanDuration: 180; +emojiPanShowDuration: 200; +emojiPanDuration: 200; emojiPanHover: windowBgOver; -emojiPanSlideDuration: 180; +emojiPanSlideDuration: 200; emojiPanArea: size(34px, 32px); emojiPanRadius: 8px; emojiPanReactionsPreviewPadding: margins(10px, 20px, 10px, 20px); @@ -469,7 +469,7 @@ defaultTabbedSearchCancel: CrossButton { crossFgOver: menuIconFg; crossPosition: point(1px, 3px); - duration: 135; + duration: 150; loadingPeriod: 1000; ripple: emptyRippleAnimation; } @@ -555,7 +555,7 @@ stickerPanRemoveSet: IconButton(hashtagClose) { rippleAreaPosition: point(0px, 0px); } stickerIconMove: 400; -stickerPreviewDuration: 135; +stickerPreviewDuration: 150; stickerPreviewMin: 0.1; emojiPanColorAll: IconButton(stickerPanRemoveSet) { @@ -906,7 +906,7 @@ defaultMessageBar: MessageBar { text: defaultTextStyle; textFg: historyComposeAreaFg; textPalette: historyComposeAreaPalette; - duration: 150; + duration: 160; } historyComposeButton: FlatButton { diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style index 03b3964297..e065e4d99c 100644 --- a/Telegram/SourceFiles/dialogs/dialogs.style +++ b/Telegram/SourceFiles/dialogs/dialogs.style @@ -145,7 +145,7 @@ forumDialogJumpRadius: 11px; dialogsOnlineBadgeStroke: 3px; dialogsOnlineBadgeSize: 12px; dialogsOnlineBadgeSkip: point(0px, 0px); -dialogsOnlineBadgeDuration: 135; +dialogsOnlineBadgeDuration: 150; dialogsCallBadgeSize: 16px; dialogsCallBadgeSkip: point(-3px, -3px); diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index e8c1b617db..064f35b7fa 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -804,7 +804,7 @@ infoMembersCancelSearch: CrossButton { crossFgOver: menuIconFgOver; crossPosition: point(0px, 0px); - duration: 135; + duration: 150; loadingPeriod: 1000; ripple: defaultRippleAnimationBgOver; } diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style index 888fd3d34a..addceaccb7 100644 --- a/Telegram/SourceFiles/intro/intro.style +++ b/Telegram/SourceFiles/intro/intro.style @@ -81,8 +81,8 @@ introNextSlide: 200px; introStepHeight: 384px; introContentTopAdd: 30px; introStepHeightFull: 590px; -introSlideDuration: 180; -introCoverDuration: 180; +introSlideDuration: 200; +introCoverDuration: 200; introNextButton: RoundButton(defaultActiveButton) { width: 300px; diff --git a/Telegram/SourceFiles/media/player/media_player.style b/Telegram/SourceFiles/media/player/media_player.style index dae713684a..18d26254b7 100644 --- a/Telegram/SourceFiles/media/player/media_player.style +++ b/Telegram/SourceFiles/media/player/media_player.style @@ -82,7 +82,7 @@ mediaPlayerButton: MediaPlayerButton { color: lightButtonBgOver; } - duration: 180; + duration: 200; } mediaPlayerWideWidth: 460px; mediaPlayerHeight: 35px; @@ -289,7 +289,7 @@ mediaPlayerPlayback: FilledSlider { activeFg: mediaPlayerActiveFg; inactiveFg: mediaPlayerInactiveFg; disabledFg: mediaPlayerDisabledFg; - duration: 135; + duration: 150; } mediaPlayerPanelMarginLeft: 10px; diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style index 26a6efcd9c..ca1e183d8b 100644 --- a/Telegram/SourceFiles/media/view/media_view.style +++ b/Telegram/SourceFiles/media/view/media_view.style @@ -224,8 +224,8 @@ mediaviewIconOver: 36px; mediaviewWaitHide: 2000; mediaviewHideDuration: 1000; -mediaviewShowDuration: 180; -mediaviewFadeDuration: 135; +mediaviewShowDuration: 200; +mediaviewFadeDuration: 150; mediaviewDeltaFromLastAction: 5px; mediaviewSwipeDistance: 80px; diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index de4ec4d068..c70556184d 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -380,7 +380,7 @@ botKbTinyButton: BotKeyboardButton { botKbScroll: defaultSolidScroll; historyScrollDateHideTimeout: 1000; -historyDateFadeDuration: 180; +historyDateFadeDuration: 200; historyDiceToast: Toast(defaultToast) { minWidth: msgMinWidth; maxWidth: 640px; @@ -512,7 +512,7 @@ attachPreviewThumbLayout: HistoryFileLayout { msgFileMinWidth: 268px; msgFileTopMinus: 6px; -msgFileOverDuration: 180; +msgFileOverDuration: 200; msgFileRadialLine: 3px; msgWaveformBar: 2px; @@ -568,12 +568,12 @@ historyAdminLogCancelSearch: CrossButton { crossFgOver: menuIconFgOver; crossPosition: point(6px, 11px); - duration: 135; + duration: 150; loadingPeriod: 1000; ripple: defaultRippleAnimationBgOver; } historyAdminLogSearchTop: 11px; -historyAdminLogSearchSlideDuration: 135; +historyAdminLogSearchSlideDuration: 150; historyFastShareSize: 31px; historyFastShareLeft: 13px; diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style index 5cc8a17b18..298e315055 100644 --- a/Telegram/SourceFiles/ui/effects/premium.style +++ b/Telegram/SourceFiles/ui/effects/premium.style @@ -133,7 +133,7 @@ premiumPreviewButtonLabel: FlatLabel(defaultFlatLabel) { textFg: premiumButtonFg; style: semiboldTextStyle; } -premiumSlideDuration: 180; +premiumSlideDuration: 200; premiumVideoStarSize: size(77px, 73px); premiumPreviewHeight: 312px; diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index ac60070700..b56f520d61 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -54,7 +54,7 @@ notifyWidth: 320px; notifyMinHeight: 80px; notifyDeltaX: 6px; notifyDeltaY: 7px; -notifyActionsDuration: 180; +notifyActionsDuration: 200; notifyHideAllHeight: 36px; @@ -188,7 +188,7 @@ connectingRetryLink: LinkButton(defaultLinkButton) { } connectingProxyOff: icon {{ "proxy_off", menuIconFg }}; connectingProxyOn: icon {{ "proxy_on", windowBgActive }}; -connectingDuration: 135; +connectingDuration: 150; windowOutdatedDetails: FlatLabel(defaultFlatLabel) { align: align(top); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 7f7c2518c0..75dd2c53cd 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 7f7c2518c0970120922ba9abe6400ee78450525f +Subproject commit 75dd2c53cd776b9293ef03c7299d76fd16d60489