From 7092fe2242fb1661abb3f947ec69695b92ea8c24 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sun, 20 Oct 2024 03:38:47 +0300 Subject: [PATCH] Added default ripple animation style with windowBgOver color. --- Telegram/SourceFiles/boxes/boxes.style | 24 ++++------------ Telegram/SourceFiles/calls/calls.style | 8 ++---- .../chat_helpers/chat_helpers.style | 28 +++++-------------- Telegram/SourceFiles/dialogs/dialogs.style | 4 +-- Telegram/SourceFiles/info/info.style | 16 +++-------- Telegram/SourceFiles/intro/intro.style | 4 +-- Telegram/SourceFiles/iv/iv.style | 8 ++---- Telegram/SourceFiles/passport/passport.style | 4 +-- Telegram/SourceFiles/ui/chat/chat.style | 8 ++---- Telegram/SourceFiles/window/window.style | 4 +-- Telegram/lib_ui | 2 +- 11 files changed, 28 insertions(+), 82 deletions(-) diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 22e7da4a60..8450986289 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -154,9 +154,7 @@ contactsSortButton: IconButton(defaultIconButton) { iconPosition: point(10px, -1px); rippleAreaPosition: point(1px, 6px); rippleAreaSize: 42px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } contactsSortOnlineIcon: icon{{ "contacts_online", boxTitleCloseFg }}; contactsSortOnlineIconOver: icon{{ "contacts_online", boxTitleCloseFgOver }}; @@ -416,9 +414,7 @@ calendarPrevious: IconButton { rippleAreaPosition: point(2px, 2px); rippleAreaSize: 44px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } calendarPreviousDisabled: icon {{ "calendar_down-flip_vertical", menuIconFg }}; calendarNext: IconButton(calendarPrevious) { @@ -616,9 +612,7 @@ proxyTryIPv6Padding: margins(22px, 8px, 22px, 5px); proxyRowPadding: margins(22px, 8px, 8px, 8px); proxyRowIconSkip: 32px; proxyRowSkip: 2px; -proxyRowRipple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; -} +proxyRowRipple: defaultRippleAnimationBgOver; proxyRowTitleFg: windowFg; proxyRowTitlePalette: TextPalette(defaultTextPalette) { linkFg: windowSubTextFg; @@ -683,9 +677,7 @@ themesMenuToggle: IconButton(defaultIconButton) { rippleAreaPosition: point(4px, 4px); rippleAreaSize: 36px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } themesMenuPosition: point(-2px, 25px); @@ -738,9 +730,7 @@ createPollOptionRemove: CrossButton { duration: 150; loadingPeriod: 1000; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } createPollOptionRemovePosition: point(11px, 9px); createPollOptionEmojiPositionSkip: 4px; @@ -951,9 +941,7 @@ sponsoredUrlButton: RoundButton(defaultActiveButton) { textTop: 7px; style: defaultTextStyle; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } requestPeerRestriction: FlatLabel(defaultFlatLabel) { diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index 76b2e41dc1..7e22913e30 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -409,9 +409,7 @@ callRatingStar: IconButton { icon: icon {{ "calls/call_rating", windowSubTextFg }}; iconPosition: point(-1px, -1px); - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; rippleAreaPosition: point(0px, 0px); rippleAreaSize: 36px; } @@ -1410,9 +1408,7 @@ groupCallRtmpShowButton: IconButton(defaultIconButton) { rippleAreaPosition: point(0px, 0px); rippleAreaSize: 32px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } groupCallSettingsRtmpShowButton: IconButton(groupCallRtmpShowButton) { ripple: groupCallRipple; diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index d965b7f8a3..0c680dd1eb 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -331,9 +331,7 @@ stickersRemove: IconButton(defaultIconButton) { rippleAreaSize: 40px; rippleAreaPosition: point(0px, 0px); - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } stickersUndoRemove: RoundButton(defaultLightButton) { width: -16px; @@ -494,9 +492,7 @@ hashtagClose: IconButton { rippleAreaPosition: point(5px, 5px); rippleAreaSize: 20px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } stickerPanWidthMin: 64px; @@ -898,9 +894,7 @@ historyBusinessBotSettings: IconButton(defaultIconButton) { iconPosition: point(-1px, -1px); rippleAreaSize: 40px; rippleAreaPosition: point(4px, 9px); - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; height: 58px; width: 48px; } @@ -927,9 +921,7 @@ historyReplyCancel: IconButton { rippleAreaPosition: point(4px, 4px); rippleAreaSize: 40px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } historyPinnedShowAll: IconButton(historyReplyCancel) { icon: icon {{ "pinned_show_all", historyReplyCancelFg }}; @@ -1058,9 +1050,7 @@ historyAttach: IconButton(defaultIconButton) { rippleAreaPosition: point(2px, 3px); rippleAreaSize: 40px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } historyMessagesTTL: IconButtonWithText { @@ -1287,9 +1277,7 @@ defaultComposeFilesMenu: IconButton(defaultIconButton) { rippleAreaPosition: point(1px, 6px); rippleAreaSize: 42px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } defaultComposeFilesField: InputField(defaultInputField) { textMargins: margins(1px, 26px, 31px, 4px); @@ -1349,9 +1337,7 @@ moreChatsBarClose: IconButton(defaultIconButton) { rippleAreaPosition: point(0px, 4px); rippleAreaSize: 40px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } reportReasonTopSkip: 8px; diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style index 6451e79b4a..d039869b79 100644 --- a/Telegram/SourceFiles/dialogs/dialogs.style +++ b/Telegram/SourceFiles/dialogs/dialogs.style @@ -222,9 +222,7 @@ dialogsMenuToggle: IconButton { rippleAreaPosition: point(0px, 0px); rippleAreaSize: 40px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } dialogsMenuToggleUnread: icon { { "dialogs/dialogs_menu_unread", dialogsMenuIconFg }, diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 0c66b41a75..84dca5dec3 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -129,9 +129,7 @@ infoTopBarBack: IconButton(defaultIconButton) { rippleAreaPosition: point(6px, 6px); rippleAreaSize: 42px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } infoTopBarTitle: FlatLabel(defaultFlatLabel) { textFg: windowBoldFg; @@ -623,9 +621,7 @@ infoMembersCancelSearch: CrossButton { duration: 150; loadingPeriod: 1000; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } infoMembersSearchTop: 15px; @@ -841,9 +837,7 @@ topBarSearch: IconButton { rippleAreaPosition: point(0px, 7px); rippleAreaSize: 40px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } topBarCloseChoose: IconButton(topBarSearch) { width: 56px; @@ -1146,9 +1140,7 @@ infoHoursDayLabel: infoHoursState; infoHoursOuter: RoundButton(defaultActiveButton) { textBg: transparent; textBgOver: transparent; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } infoHoursOuterMargin: margins(8px, 4px, 8px, 4px); infoHoursDaySkip: 6px; diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style index a6b8a7a4ca..ddf09c24b6 100644 --- a/Telegram/SourceFiles/intro/intro.style +++ b/Telegram/SourceFiles/intro/intro.style @@ -165,9 +165,7 @@ introBackButton: IconButton(defaultIconButton) { rippleAreaPosition: point(8px, 8px); rippleAreaSize: 40px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } introQrTop: -18px; diff --git a/Telegram/SourceFiles/iv/iv.style b/Telegram/SourceFiles/iv/iv.style index cea363566f..a3129f5d29 100644 --- a/Telegram/SourceFiles/iv/iv.style +++ b/Telegram/SourceFiles/iv/iv.style @@ -17,9 +17,7 @@ ivMenuToggle: IconButton(defaultIconButton) { rippleAreaPosition: point(6px, 6px); rippleAreaSize: 36px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } ivMenuPosition: point(-2px, 40px); ivBackIcon: icon {{ "box_button_back", menuIconColor }}; @@ -36,9 +34,7 @@ ivPlusMinusZoom: IconButton(ivMenuToggle) { rippleAreaPosition: point(0px, 0px); rippleAreaSize: ivZoomButtonsSize; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } ivResetZoomStyle: TextStyle(defaultTextStyle) { font: font(12px); diff --git a/Telegram/SourceFiles/passport/passport.style b/Telegram/SourceFiles/passport/passport.style index f3a4985753..df494e425f 100644 --- a/Telegram/SourceFiles/passport/passport.style +++ b/Telegram/SourceFiles/passport/passport.style @@ -108,9 +108,7 @@ passportContactErrorMargin: margins(0px, 0px, 0px, 14px); passportRowPadding: margins(22px, 8px, 25px, 8px); passportRowIconSkip: 10px; passportRowSkip: 2px; -passportRowRipple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; -} +passportRowRipple: defaultRippleAnimationBgOver; passportRowReadyIcon: icon {{ "passport_ready", windowActiveTextFg }}; passportRowEmptyIcon: icon {{ "passport_empty", menuIconFgOver }}; passportRowTitleFg: windowFg; diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index 2f9af4f2ba..7633eed080 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -551,9 +551,7 @@ historyAdminLogCancelSearch: CrossButton { duration: 150; loadingPeriod: 1000; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } historyAdminLogSearchTop: 11px; historyAdminLogSearchSlideDuration: 150; @@ -977,9 +975,7 @@ backgroundSwitchToDark: IconButton(defaultIconButton) { rippleAreaPosition: point(4px, 4px); rippleAreaSize: 40px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } backgroundSwitchToLight: IconButton(backgroundSwitchToDark) { icon: icon {{ "menu/header_mode_day", boxTitleCloseFg }}; diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index 37654c9907..32e233a0d1 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -43,9 +43,7 @@ notifyClose: IconButton { rippleAreaPosition: point(5px, 5px); rippleAreaSize: 20px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: windowBgOver; - } + ripple: defaultRippleAnimationBgOver; } notifyItemTop: 12px; notifyTextLeft: 12px; diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 9ac125c505..0198796f90 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 9ac125c505ef105c62c50dd102d19f20f09210c1 +Subproject commit 0198796f9011aeb8b1449e42a3cae02222df12fc