From df7026b59c90bd0bce9d6581242675d69f7872ac Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sun, 2 May 2021 12:24:48 +0300 Subject: [PATCH] Made alignment to bottom for button strip in photo editor. --- Telegram/SourceFiles/editor/editor.style | 2 +- Telegram/SourceFiles/editor/photo_editor_controls.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/editor/editor.style b/Telegram/SourceFiles/editor/editor.style index 6c6856d14..b0a238e2c 100644 --- a/Telegram/SourceFiles/editor/editor.style +++ b/Telegram/SourceFiles/editor/editor.style @@ -11,7 +11,7 @@ using "ui/widgets/widgets.style"; using "ui/chat/chat.style"; photoEditorControlsHeight: 100px; -photoEditorControlsTopSkip: 40px; +photoEditorControlsBottomSkip: 20px; photoEditorButtonIconFg: mediaviewPipControlsFg; photoEditorButtonIconFgOver: mediaviewPipControlsFgOver; diff --git a/Telegram/SourceFiles/editor/photo_editor_controls.cpp b/Telegram/SourceFiles/editor/photo_editor_controls.cpp index 98d20b245..da2bb36c0 100644 --- a/Telegram/SourceFiles/editor/photo_editor_controls.cpp +++ b/Telegram/SourceFiles/editor/photo_editor_controls.cpp @@ -204,8 +204,6 @@ PhotoEditorControls::PhotoEditorControls( }, lifetime()); - const auto &buttonsTop = st::photoEditorControlsTopSkip; - rpl::combine( sizeValue(), _mode.value() @@ -216,6 +214,10 @@ PhotoEditorControls::PhotoEditorControls( return; } + const auto buttonsTop = height() + - st::photoEditorControlsBottomSkip + - _transformButtons->height(); + const auto ¤t = _transformButtons->isHidden() ? _paintButtons : _transformButtons;