fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-21 00:23:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix slide animations with new layer rounding.

Browse Source
This commit is contained in:
John Preston
2022-02-23 13:53:27 +03:00
parent 1a664edd39
commit ffd65e1fe4
11 changed files with 67 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/SourceFiles/settings/settings_intro.cpp
View File

@@ -102,7 +102,6 @@ object_ptr<Ui::RpWidget> CreateIntroSettings(
AddDivider(result);
AddSkip(result);
SetupFaq(result, false);
AddSkip(result);
return result;
}
@@ -110,7 +109,6 @@ object_ptr<Ui::RpWidget> CreateIntroSettings(
TopBar::TopBar(QWidget *parent, const style::InfoTopBar &st)
: RpWidget(parent)
, _st(st) {
setAttribute(Qt::WA_OpaquePaintEvent);
}
void TopBar::setTitle(rpl::producer<QString> &&title) {
@@ -156,8 +154,10 @@ void TopBar::updateControlsGeometry(int newWidth) {
}
void TopBar::paintEvent(QPaintEvent *e) {
Painter p(this);
p.fillRect(e->rect(), _st.bg);
const auto radius = st::boxRadius;
QPainter(this).fillRect(
e->rect().intersected({ 0, radius, width(), height() - radius }),
_st.bg);
}
} // namespace
@@ -452,11 +452,7 @@ int LayerWidget::resizeGetHeight(int newWidth) {
auto windowHeight = parentSize.height();
auto newLeft = (windowWidth - newWidth) / 2;
if (!newLeft) {
_content->updateGeometry({
0,
st::boxRadius,
windowWidth,
windowHeight - st::boxRadius }, 0);
_content->updateGeometry({ 0, 0, windowWidth, windowHeight }, 0);
auto newGeometry = QRect(0, 0, windowWidth, windowHeight);
if (newGeometry != geometry()) {
_content->forceContentRepaint();
@@ -472,12 +468,12 @@ int LayerWidget::resizeGetHeight(int newWidth) {
st::infoLayerTopMinimal,
st::infoLayerTopMaximal);
auto newBottom = newTop;
auto desiredHeight = st::boxRadius + _desiredHeight + st::boxRadius;
auto desiredHeight = _desiredHeight + st::boxRadius;
accumulate_min(desiredHeight, windowHeight - newTop - newBottom);
// First resize content to new width and get the new desired height.
auto contentLeft = 0;
auto contentTop = st::boxRadius;
auto contentTop = 0;
auto contentBottom = st::boxRadius;
auto contentWidth = newWidth;
auto contentHeight = desiredHeight - contentTop - contentBottom;