kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Improve label cross fade animation.

Browse source
This commit is contained in:
John Preston 2019-09-23 21:24:10 +03:00
parent 71adf272c5
commit 16adecf500
2 changed files with 85 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
ui/widgets/labels.cpp
View file

@ -38,7 +38,45 @@ TextParseOptions _labelMarkedOptions = {
} // namespace } // namespace
CrossFadeAnimation::CrossFadeAnimation(style::color bg) : _bg(bg) { CrossFadeAnimation::CrossFadeAnimation(
style::color bg,
Data &&was,
Data &&now)
: _bg(bg) {
const auto maxLines = qMax(was.lineWidths.size(), now.lineWidths.size());
auto fillDataTill = [&](Data &data) {
for (auto i = data.lineWidths.size(); i != maxLines; ++i) {
data.lineWidths.push_back(-1);
}
};
fillDataTill(was);
fillDataTill(now);
auto preparePart = [](const Data &data, int index, const Data &other) {
auto result = CrossFadeAnimation::Part();
auto lineWidth = data.lineWidths[index];
if (lineWidth < 0) {
lineWidth = other.lineWidths[index];
}
const auto pixelRatio = style::DevicePixelRatio();
auto fullWidth = data.full.width() / pixelRatio;
auto top = index * data.lineHeight + data.lineAddTop;
auto left = 0;
if (data.align & Qt::AlignHCenter) {
left += (fullWidth - lineWidth) / 2;
} else if (data.align & Qt::AlignRight) {
left += (fullWidth - lineWidth);
}
auto snapshotRect = data.full.rect().intersected(QRect(left * pixelRatio, top * pixelRatio, lineWidth * pixelRatio, data.font->height * pixelRatio));
if (!snapshotRect.isEmpty()) {
result.snapshot = PixmapFromImage(data.full.copy(snapshotRect));
result.snapshot.setDevicePixelRatio(pixelRatio);
}
result.position = data.position + QPoint(data.margin.left() + left, data.margin.top() + top);
return result;
};
for (int i = 0; i != maxLines; ++i) {
addLine(preparePart(was, i, now), preparePart(now, i, was));
}
} }
void CrossFadeAnimation::addLine(Part was, Part now) { void CrossFadeAnimation::addLine(Part was, Part now) {
@ -92,9 +130,9 @@ void CrossFadeAnimation::paintLine(
if (topDelta > 0) { if (topDelta > 0) {
p.fillRect(left, topWas - topDelta, snapshotWas.width() / pixelRatio, topDelta, _bg); p.fillRect(left, topWas - topDelta, snapshotWas.width() / pixelRatio, topDelta, _bg);
} }
} if (widthDelta > 0) {
if (widthDelta > 0) { p.fillRect(left + (snapshotWas.width() / pixelRatio), topNow, widthDelta, snapshotNow.height() / pixelRatio, _bg);
p.fillRect(left + (snapshotWas.width() / pixelRatio), topNow, widthDelta, snapshotNow.height() / pixelRatio, _bg); }
} }
p.setOpacity(alphaNow); p.setOpacity(alphaNow);
@ -103,9 +141,9 @@ void CrossFadeAnimation::paintLine(
if (topDelta < 0) { if (topDelta < 0) {
p.fillRect(left, topNow + topDelta, snapshotNow.width() / pixelRatio, -topDelta, _bg); p.fillRect(left, topNow + topDelta, snapshotNow.width() / pixelRatio, -topDelta, _bg);
} }
} if (widthDelta < 0) {
if (widthDelta < 0) { p.fillRect(left + (snapshotNow.width() / pixelRatio), topWas, -widthDelta, snapshotWas.height() / pixelRatio, _bg);
p.fillRect(left + (snapshotNow.width() / pixelRatio), topWas, -widthDelta, snapshotWas.height() / pixelRatio, _bg); }
} }
} }
@ -686,73 +724,36 @@ void FlatLabel::clickHandlerPressedChanged(const ClickHandlerPtr &action, bool a
update(); update();
} }
CrossFadeAnimation::Data FlatLabel::crossFadeData(
style::color bg,
QPoint basePosition) {
auto result = CrossFadeAnimation::Data();
result.full = GrabWidgetToImage(this, QRect(), bg->c);
const auto textWidth = width() - _st.margin.left() - _st.margin.right();
_text.countLineWidths(textWidth, &result.lineWidths, _breakEverywhere);
result.lineHeight = _st.style.font->height;
const auto addedHeight = (_st.style.lineHeight - result.lineHeight);
if (addedHeight > 0) {
result.lineAddTop = addedHeight / 2;
result.lineHeight += addedHeight;
}
result.position = pos();
result.align = _st.align;
result.font = _st.style.font;
result.margin = _st.margin;
return result;
}
std::unique_ptr<CrossFadeAnimation> FlatLabel::CrossFade( std::unique_ptr<CrossFadeAnimation> FlatLabel::CrossFade(
not_null<FlatLabel*> from, not_null<FlatLabel*> from,
not_null<FlatLabel*> to, not_null<FlatLabel*> to,
style::color bg, style::color bg,
QPoint fromPosition, QPoint fromPosition,
QPoint toPosition) { QPoint toPosition) {
auto result = std::make_unique<CrossFadeAnimation>(bg); return std::make_unique<CrossFadeAnimation>(
bg,
struct Data { from->crossFadeData(bg, fromPosition),
QImage full; to->crossFadeData(bg, toPosition));
QVector<int> lineWidths;
int lineHeight = 0;
int lineAddTop = 0;
};
auto prepareData = [&bg](not_null<FlatLabel*> label) {
auto result = Data();
result.full = GrabWidgetToImage(label, QRect(), bg->c);
auto textWidth = label->width() - label->_st.margin.left() - label->_st.margin.right();
label->_text.countLineWidths(textWidth, &result.lineWidths, label->_breakEverywhere);
result.lineHeight = label->_st.style.font->height;
auto addedHeight = (label->_st.style.lineHeight - result.lineHeight);
if (addedHeight > 0) {
result.lineAddTop = addedHeight / 2;
result.lineHeight += addedHeight;
}
return result;
};
auto was = prepareData(from);
auto now = prepareData(to);
auto maxLines = qMax(was.lineWidths.size(), now.lineWidths.size());
auto fillDataTill = [maxLines](Data &data) {
for (auto i = data.lineWidths.size(); i != maxLines; ++i) {
data.lineWidths.push_back(-1);
}
};
fillDataTill(was);
fillDataTill(now);
auto preparePart = [](FlatLabel *label, QPoint position, Data &data, int index, Data &other) {
auto result = CrossFadeAnimation::Part();
auto lineWidth = data.lineWidths[index];
if (lineWidth < 0) {
lineWidth = other.lineWidths[index];
}
const auto pixelRatio = style::DevicePixelRatio();
auto fullWidth = data.full.width() / pixelRatio;
auto top = index * data.lineHeight + data.lineAddTop;
auto left = 0;
if (label->_st.align & Qt::AlignHCenter) {
left += (fullWidth - lineWidth) / 2;
} else if (label->_st.align & Qt::AlignRight) {
left += (fullWidth - lineWidth);
}
auto snapshotRect = data.full.rect().intersected(QRect(left * pixelRatio, top * pixelRatio, lineWidth * pixelRatio, label->_st.style.font->height * pixelRatio));
if (!snapshotRect.isEmpty()) {
result.snapshot = PixmapFromImage(data.full.copy(snapshotRect));
result.snapshot.setDevicePixelRatio(pixelRatio);
}
auto positionBase = position + label->pos();
result.position = positionBase + QPoint(label->_st.margin.left() + left, label->_st.margin.top() + top);
return result;
};
for (int i = 0; i != maxLines; ++i) {
result->addLine(preparePart(from, fromPosition, was, i, now), preparePart(to, toPosition, now, i, was));
}
return result;
} }
Text::StateResult FlatLabel::dragActionUpdate() { Text::StateResult FlatLabel::dragActionUpdate() {

17
ui/widgets/labels.h
View file

@ -24,7 +24,18 @@ class BoxContentDivider;
class CrossFadeAnimation { class CrossFadeAnimation {
public: public:
CrossFadeAnimation(style::color bg); struct Data {
QImage full;
QVector<int> lineWidths;
QPoint position;
style::align align;
style::font font;
style::margins margin;
int lineHeight = 0;
int lineAddTop = 0;
};
CrossFadeAnimation(style::color bg, Data &&from, Data &&to);
struct Part { struct Part {
QPixmap snapshot; QPixmap snapshot;
@ -127,6 +138,10 @@ public:
void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) override; void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) override;
void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) override; void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) override;
[[nodiscard]] CrossFadeAnimation::Data crossFadeData(
style::color bg,
QPoint basePosition = QPoint());
static std::unique_ptr<CrossFadeAnimation> CrossFade( static std::unique_ptr<CrossFadeAnimation> CrossFade(
not_null<FlatLabel*> from, not_null<FlatLabel*> from,
not_null<FlatLabel*> to, not_null<FlatLabel*> to,