From 2256482ae09316ea34b7ef34b5868bfc2f617f70 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 26 Jul 2021 01:20:42 +0300 Subject: [PATCH] Moved layout utils to td_ui. --- Telegram/CMakeLists.txt | 2 -- Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp | 2 +- Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp | 2 +- Telegram/SourceFiles/history/history_item_components.cpp | 2 +- Telegram/SourceFiles/inline_bots/inline_results_inner.cpp | 2 +- .../SourceFiles/inline_bots/inline_results_mosaic_layout.cpp | 2 +- .../layout/{layout_utils.cpp => layout_position.cpp} | 2 +- .../SourceFiles/layout/{layout_utils.h => layout_position.h} | 0 Telegram/SourceFiles/overview/overview_mosaic_layout.cpp | 2 +- Telegram/cmake/td_ui.cmake | 2 ++ 10 files changed, 9 insertions(+), 9 deletions(-) rename Telegram/SourceFiles/layout/{layout_utils.cpp => layout_position.cpp} (95%) rename Telegram/SourceFiles/layout/{layout_utils.h => layout_position.h} (100%) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 0e0ab10d3..a4d9b03e4 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -704,8 +704,6 @@ PRIVATE lang/lang_numbers_animation.h lang/lang_translator.cpp lang/lang_translator.h - layout/layout_utils.cpp - layout/layout_utils.h main/main_account.cpp main/main_account.h main/main_app_config.cpp diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp index 14ccbcfdd..5dab2b723 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp @@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/ui_utility.h" #include "ui/cached_round_corners.h" #include "lang/lang_keys.h" -#include "layout/layout_utils.h" +#include "layout/layout_position.h" #include "emoji_suggestions_data.h" #include "emoji_suggestions_helper.h" #include "main/main_session.h" diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp index ff538de19..4db2e974d 100644 --- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp @@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "inline_bots/inline_bot_result.h" #include "storage/localstorage.h" #include "lang/lang_keys.h" -#include "layout/layout_utils.h" +#include "layout/layout_position.h" #include "mainwindow.h" #include "main/main_session.h" #include "window/window_session_controller.h" diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp index d88725bf2..6bd10b360 100644 --- a/Telegram/SourceFiles/history/history_item_components.cpp +++ b/Telegram/SourceFiles/history/history_item_components.cpp @@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/view/history_view_service_message.h" #include "history/view/media/history_view_document.h" #include "core/click_handler_types.h" -#include "layout/layout_utils.h" +#include "layout/layout_position.h" #include "mainwindow.h" #include "media/audio/media_audio.h" #include "media/player/media_player_instance.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp index fd4eff4ec..7e8dcd973 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp @@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "inline_bots/inline_bot_result.h" #include "inline_bots/inline_bot_layout_item.h" #include "lang/lang_keys.h" -#include "layout/layout_utils.h" +#include "layout/layout_position.h" #include "mainwindow.h" #include "facades.h" #include "main/main_session.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_results_mosaic_layout.cpp b/Telegram/SourceFiles/inline_bots/inline_results_mosaic_layout.cpp index f7c6e1451..a67f5b59b 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_mosaic_layout.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_mosaic_layout.cpp @@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "inline_bots/inline_results_mosaic_layout.h" #include "history/view/history_view_cursor_state.h" -#include "layout/layout_utils.h" +#include "layout/layout_position.h" #include "styles/style_chat_helpers.h" namespace InlineBots::Layout { diff --git a/Telegram/SourceFiles/layout/layout_utils.cpp b/Telegram/SourceFiles/layout/layout_position.cpp similarity index 95% rename from Telegram/SourceFiles/layout/layout_utils.cpp rename to Telegram/SourceFiles/layout/layout_position.cpp index f82571aeb..2631e2caf 100644 --- a/Telegram/SourceFiles/layout/layout_utils.cpp +++ b/Telegram/SourceFiles/layout/layout_position.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "layout/layout_utils.h" +#include "layout/layout_position.h" namespace Layout { namespace { diff --git a/Telegram/SourceFiles/layout/layout_utils.h b/Telegram/SourceFiles/layout/layout_position.h similarity index 100% rename from Telegram/SourceFiles/layout/layout_utils.h rename to Telegram/SourceFiles/layout/layout_position.h diff --git a/Telegram/SourceFiles/overview/overview_mosaic_layout.cpp b/Telegram/SourceFiles/overview/overview_mosaic_layout.cpp index 351e4051c..9352c1c83 100644 --- a/Telegram/SourceFiles/overview/overview_mosaic_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_mosaic_layout.cpp @@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "overview/overview_mosaic_layout.h" #include "history/view/history_view_cursor_state.h" -#include "layout/layout_utils.h" +#include "layout/layout_position.h" #include "styles/style_chat_helpers.h" namespace Overview::Layout { diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake index bffc6f548..60c4159b0 100644 --- a/Telegram/cmake/td_ui.cmake +++ b/Telegram/cmake/td_ui.cmake @@ -63,6 +63,8 @@ PRIVATE layout/abstract_layout_item.cpp layout/abstract_layout_item.h + layout/layout_position.cpp + layout/layout_position.h media/clip/media_clip_check_streaming.cpp media/clip/media_clip_check_streaming.h