mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Use tr:: instead of langFactory and __rich.

Browse Source
This commit is contained in:
John Preston
2019-06-18 18:53:27 +02:00
parent d1d98c3bb1
commit a7c8feaecb
103 changed files with 699 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Telegram/SourceFiles/ui/widgets/buttons.cpp
View File

@@ -230,21 +230,26 @@ void FlatButton::setTextMargins(QMargins margins) {
update();
}
RoundButton::RoundButton(QWidget *parent, Fn<QString()> textFactory, const style::RoundButton &st) : RippleButton(parent, st.ripple)
, _textFactory(std::move(textFactory))
RoundButton::RoundButton(
QWidget *parent,
rpl::producer<QString> text,
const style::RoundButton &st)
: RippleButton(parent, st.ripple)
, _textFull(std::move(text))
, _st(st) {
subscribe(Lang::Current().updated(), [this] { refreshText(); });
refreshText();
_textFull.value(
) | rpl::start_with_next([=](const QString &text) {
resizeToText(text);
}, lifetime());
}
void RoundButton::setTextTransform(TextTransform transform) {
_transform = transform;
refreshText();
resizeToText(_textFull.current());
}
void RoundButton::setText(Fn<QString()> textFactory) {
_textFactory = std::move(textFactory);
refreshText();
void RoundButton::setText(rpl::producer<QString> text) {
_textFull = std::move(text);
}
void RoundButton::setNumbersText(const QString &numbersText, int numbers) {
@@ -258,7 +263,7 @@ void RoundButton::setNumbersText(const QString &numbersText, int numbers) {
}
_numbers->setText(numbersText, numbers);
}
refreshText();
resizeToText(_textFull.current());
}
void RoundButton::setWidthChangedCallback(Fn<void()> callback) {
@@ -277,13 +282,12 @@ void RoundButton::finishNumbersAnimation() {
}
void RoundButton::numbersAnimationCallback() {
resizeToText();
update();
resizeToText(_textFull.current());
}
void RoundButton::setFullWidth(int newFullWidth) {
_fullWidthOverride = newFullWidth;
refreshText();
resizeToText(_textFull.current());
}
void RoundButton::setFullRadius(bool enabled) {
@@ -291,24 +295,14 @@ void RoundButton::setFullRadius(bool enabled) {
update();
}
void RoundButton::refreshText() {
_text = computeFullText();
_textWidth = _text.isEmpty() ? 0 : _st.font->width(_text);
void RoundButton::resizeToText(const QString &text) {
_text = (_transform == TextTransform::ToUpper) ? text.toUpper() : text;
_textWidth = _st.font->width(_text);
resizeToText();
update();
}
QString RoundButton::computeFullText() const {
auto result = _textFactory ? _textFactory() : QString();
return (_transform == TextTransform::ToUpper) ? result.toUpper() : result;
}
void RoundButton::resizeToText() {
int innerWidth = contentWidth();
if (_fullWidthOverride > 0) {
if (_fullWidthOverride < innerWidth + (_st.height - _st.font->height)) {
_text = _st.font->elided(computeFullText(), qMax(_fullWidthOverride - (_st.height - _st.font->height), 1));
_text = _st.font->elided(text, qMax(_fullWidthOverride - (_st.height - _st.font->height), 1));
_textWidth = _st.font->width(_text);
}
resize(_fullWidthOverride, _st.height + _st.padding.top() + _st.padding.bottom());
@@ -318,11 +312,13 @@ void RoundButton::resizeToText() {
resize(innerWidth - _st.width + _st.padding.left() + _st.padding.right(), _st.height + _st.padding.top() + _st.padding.bottom());
} else {
if (_st.width < innerWidth + (_st.height - _st.font->height)) {
_text = _st.font->elided(computeFullText(), qMax(_st.width - (_st.height - _st.font->height), 1));
_text = _st.font->elided(_text, qMax(_st.width - (_st.height - _st.font->height), 1));
_textWidth = _st.font->width(_text);
}
resize(_st.width + _st.padding.left() + _st.padding.right(), _st.height + _st.padding.top() + _st.padding.bottom());
}
update();
}
int RoundButton::contentWidth() const {

10
Telegram/SourceFiles/ui/widgets/buttons.h
View File

@@ -105,10 +105,10 @@ class RoundButton : public RippleButton, private base::Subscriber {
public:
RoundButton(
QWidget *parent,
Fn<QString()> textFactory,
rpl::producer<QString> text,
const style::RoundButton &st);
void setText(Fn<QString()> textFactory);
void setText(rpl::producer<QString> text);
void setNumbersText(const QString &numbersText) {
setNumbersText(numbersText, numbersText.toInt());
@@ -139,14 +139,12 @@ protected:
QPoint prepareRippleStartPosition() const override;
private:
void refreshText();
QString computeFullText() const;
void setNumbersText(const QString &numbersText, int numbers);
void numbersAnimationCallback();
void resizeToText();
void resizeToText(const QString &text);
rpl::variable<QString> _textFull;
QString _text;
Fn<QString()> _textFactory;
int _textWidth;
std::unique_ptr<NumbersAnimation> _numbers;