Improved content margins in photo editor.

This commit is contained in:
23rd 2021-07-02 12:55:25 +03:00
parent 038de9ef15
commit b1477260f0
2 changed files with 9 additions and 3 deletions

View file

@ -17,6 +17,12 @@ photoEditorControlsHeight: 146px;
photoEditorControlsBottomSkip: 20px; photoEditorControlsBottomSkip: 20px;
photoEditorControlsCenterSkip: 6px; photoEditorControlsCenterSkip: 6px;
photoEditorContentMargins: margins(
photoEditorControlsBottomSkip,
photoEditorControlsBottomSkip,
photoEditorControlsBottomSkip,
photoEditorControlsHeight);
photoEditorBarAnimationDuration: 200; photoEditorBarAnimationDuration: 200;
photoEditorButtonIconFg: mediaviewPipControlsFg; photoEditorButtonIconFg: mediaviewPipControlsFg;

View file

@ -80,11 +80,11 @@ PhotoEditor::PhotoEditor(
return; return;
} }
const auto geometry = QRect(QPoint(), size); const auto geometry = QRect(QPoint(), size);
const auto contentRect = geometry const auto contentRect = geometry - st::photoEditorContentMargins;
- style::margins(0, 0, 0, st::photoEditorControlsHeight);
_content->setGeometry(contentRect); _content->setGeometry(contentRect);
const auto contentBottom = contentRect.top() + contentRect.height();
const auto controlsRect = geometry const auto controlsRect = geometry
- style::margins(0, contentRect.height(), 0, 0); - style::margins(0, contentBottom, 0, 0);
_controls->setGeometry(controlsRect); _controls->setGeometry(controlsRect);
}, lifetime()); }, lifetime());