void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-18 07:07:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct spoiler colors in fully selected messages.

Browse source
This commit is contained in:
John Preston 2022-09-17 01:59:27 +04:00
parent 749fb52113
commit cd00d41cca
4 changed files with 16 additions and 7 deletions
Telegram
SourceFiles
dialogs
dialogs.style
ui/chat
chat_style.cpp
window/themes
window_theme_preview.cpp
lib_ui

13
Telegram/SourceFiles/dialogs/dialogs.style
View file

@ -55,49 +55,62 @@ dialogsTextWidthMin: 150px;
dialogsTextPalette: TextPalette(defaultTextPalette) {
linkFg: dialogsTextFgService;
monoFg: dialogsTextFg;
spoilerFg: dialogsTextFg;
}
dialogsTextPaletteOver: TextPalette(defaultTextPalette) {
linkFg: dialogsTextFgServiceOver;
monoFg: dialogsTextFgOver;
spoilerFg: dialogsTextFgOver;
}
dialogsTextPaletteActive: TextPalette(defaultTextPalette) {
linkFg: dialogsTextFgServiceActive;
monoFg: dialogsTextFgActive;
spoilerFg: dialogsTextFgActive;
}
dialogsTextPaletteDraft: TextPalette(defaultTextPalette) {
linkFg: dialogsDraftFg;
monoFg: dialogsTextFg;
spoilerFg: dialogsTextFg;
}
dialogsTextPaletteDraftOver: TextPalette(defaultTextPalette) {
linkFg: dialogsDraftFgOver;
monoFg: dialogsTextFgOver;
spoilerFg: dialogsTextFgOver;
}
dialogsTextPaletteDraftActive: TextPalette(defaultTextPalette) {
linkFg: dialogsDraftFgActive;
monoFg: dialogsTextFgActive;
spoilerFg: dialogsTextFgActive;
}
dialogsTextPaletteTaken: TextPalette(defaultTextPalette) {
linkFg: boxTextFgGood;
monoFg: dialogsTextFg;
spoilerFg: dialogsTextFg;
}
dialogsTextPaletteTakenOver: TextPalette(defaultTextPalette) {
linkFg: boxTextFgGood;
monoFg: dialogsTextFgOver;
spoilerFg: dialogsTextFgOver;
}
dialogsTextPaletteTakenActive: TextPalette(defaultTextPalette) {
linkFg: dialogsDraftFgActive;
monoFg: dialogsTextFgActive;
spoilerFg: dialogsTextFgActive;
}
dialogsTextPaletteArchive: TextPalette(defaultTextPalette) {
linkFg: dialogsArchiveFg;
monoFg: dialogsArchiveFg;
spoilerFg: dialogsArchiveFg;
}
dialogsTextPaletteArchiveOver: TextPalette(defaultTextPalette) {
linkFg: dialogsArchiveFgOver;
monoFg: dialogsArchiveFgOver;
spoilerFg: dialogsArchiveFgOver;
}
dialogsTextPaletteArchiveActive: TextPalette(defaultTextPalette) {
linkFg: dialogsTextFgActive;
monoFg: dialogsTextFgActive;
spoilerFg: dialogsTextFgActive;
}
dialogsEmptyHeight: 160px;

4
Telegram/SourceFiles/ui/chat/chat_style.cpp
View file

@ -632,9 +632,7 @@ void ChatStyle::make(
make(my.selectLinkFg, original.selectLinkFg);
make(my.selectMonoFg, original.selectMonoFg);
make(my.selectOverlay, original.selectOverlay);
make(my.spoilerBg, original.spoilerBg);
make(my.spoilerActiveBg, original.spoilerActiveBg);
make(my.spoilerActiveFg, original.spoilerActiveFg);
make(my.spoilerFg, original.spoilerFg);
}
void ChatStyle::make(

4
Telegram/SourceFiles/window/themes/window_theme_preview.cpp
View file

@ -987,9 +987,7 @@ void Generator::setTextPalette(const style::TextPalette &st) {
_textPalette.selectLinkFg = st.selectLinkFg[_palette].clone();
_textPalette.selectMonoFg = st.selectMonoFg[_palette].clone();
_textPalette.selectOverlay = st.selectOverlay[_palette].clone();
_textPalette.spoilerBg = st.spoilerBg[_palette].clone();
_textPalette.spoilerActiveBg = st.spoilerActiveBg[_palette].clone();
_textPalette.spoilerActiveFg = st.spoilerActiveFg[_palette].clone();
_textPalette.spoilerFg = st.spoilerFg[_palette].clone();
_p->setTextPalette(_textPalette);
}

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit bd7098ef426886736a2bfde17bf114f5633aa339
Subproject commit 4ff5bc5773d95b07fd34485a564d1aacc3fb9d1a