From ee5c819cef48e852f620aac97a044aba6b9c058b Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 26 Apr 2019 18:07:44 +0400 Subject: [PATCH] Fix render glitch in archive top bar. --- Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 3 ++- Telegram/SourceFiles/window/themes/window_theme_preview.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index b56dbed24c..517947d85d 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_folder.h" #include "styles/style_dialogs.h" #include "styles/style_history.h" +#include "styles/style_info.h" #include "styles/style_window.h" namespace Dialogs { @@ -1393,7 +1394,7 @@ void Widget::updateControlsGeometry() { auto filterLeft = st::dialogsFilterPadding.x() + _mainMenuToggle->width() + st::dialogsFilterPadding.x(); auto filterRight = (Global::LocalPasscode() ? (st::dialogsFilterPadding.x() + _lockUnlock->width()) : st::dialogsFilterSkip) + st::dialogsFilterPadding.x(); auto filterWidth = qMax(width(), st::columnMinimalWidthLeft) - filterLeft - filterRight; - auto filterAreaHeight = st::dialogsFilterPadding.y() + _mainMenuToggle->height() + st::dialogsFilterPadding.y(); + auto filterAreaHeight = st::topBarHeight; _searchControls->setGeometry(0, filterAreaTop, width(), filterAreaHeight); if (_folderTopBar) { _folderTopBar->setGeometry(_searchControls->geometry()); diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp index 0803e830db..5742291b33 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp @@ -531,7 +531,7 @@ void Generator::paintDialogs() { auto filterLeft = _dialogs.x() + st::dialogsFilterPadding.x() + st::dialogsMenuToggle.width + st::dialogsFilterPadding.x(); auto filterRight = st::dialogsFilterSkip + st::dialogsFilterPadding.x(); auto filterWidth = _dialogs.x() + _dialogs.width() - filterLeft - filterRight; - auto filterAreaHeight = st::dialogsFilterPadding.y() + st::dialogsMenuToggle.height + st::dialogsFilterPadding.y(); + auto filterAreaHeight = st::topBarHeight; auto filterTop = _dialogs.y() + (filterAreaHeight - st::dialogsFilter.height) / 2; auto filter = QRect(filterLeft, filterTop, filterWidth, st::dialogsFilter.height);