From 88ad1be4c303d02fa9e2a24d88b246b7b648e6e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 9 May 2024 11:12:01 +0400
Subject: [PATCH] Try to fix custom fonts in the input field.

---
 Telegram/SourceFiles/chat_helpers/chat_helpers.style | 2 +-
 Telegram/build/docker/centos_env/Dockerfile          | 2 +-
 Telegram/build/prepare/prepare.py                    | 2 +-
 Telegram/lib_ui                                      | 2 +-
 snap/snapcraft.yaml                                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 67358e4c9..f8c8ad61b 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -983,7 +983,7 @@ historyComposeField: InputField(defaultInputField) {
 	placeholderFg: placeholderFg;
 	placeholderFgActive: placeholderFgActive;
 	placeholderFgError: placeholderFgActive;
-	placeholderMargins: margins(7px, 5px, 7px, 5px);
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
 	placeholderAlign: align(topleft);
 	placeholderScale: 0.;
 	placeholderFont: normalFont;
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index d48e99710..251123360 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 1b3aa9303260613841745a71442c939b55c8aaf2 \
+	&& git fetch --depth=1 origin 25f76cf4d58fae5742447d17d2574ab1fad196e5 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 9a3d0587e..8384492e6 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 1b3aa93032
+    git checkout 25f76cf4d5
 """)
 
 stage('msys64', """
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f76ddd841..41d1fe923 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f76ddd841ca02ca35432f6de569f8c430a9713b1
+Subproject commit 41d1fe9232c1d09b1ada01a0cc552e5c66d74b89
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 79148548e..95f560866 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -167,7 +167,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 44f5103860dfa3f9b9675730231af6fbe28cde93
+    source-commit: 25f76cf4d58fae5742447d17d2574ab1fad196e5
     plugin: dump
     override-pull: |
       craftctl default