procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed text width in toast widget. 

- Fixed #6381.
This commit is contained in:
23rd 2019-08-24 13:24:49 +03:00 committed by John Preston
parent 04617e4a12
commit 7be286751b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/ui/toast/toast_widget.cpp
View File

@ -17,10 +17,10 @@ Widget::Widget(QWidget *parent, const Config &config) : TWidget(parent)
, _multiline(config.multiline) , _multiline(config.multiline)
, _maxWidth((config.maxWidth > 0) ? config.maxWidth : st::toastMaxWidth) , _maxWidth((config.maxWidth > 0) ? config.maxWidth : st::toastMaxWidth)
, _padding((config.padding.left() > 0) ? config.padding : st::toastPadding) , _padding((config.padding.left() > 0) ? config.padding : st::toastPadding)
, _maxTextWidth(_maxWidth - _padding.left() - _padding.right()) , _maxTextWidth(widthWithoutPadding(_maxWidth))
, _maxTextHeight( , _maxTextHeight(
st::toastTextStyle.font->height * (_multiline ? config.maxLines : 1)) st::toastTextStyle.font->height * (_multiline ? config.maxLines : 1))
, _text(_multiline ? config.minWidth : QFIXED_MAX) { , _text(_multiline ? widthWithoutPadding(config.minWidth) : QFIXED_MAX) {
const auto toastOptions = TextParseOptions{ const auto toastOptions = TextParseOptions{
TextParseMultiline, TextParseMultiline,
_maxTextWidth, _maxTextWidth,
@ -42,7 +42,7 @@ void Widget::onParentResized() {
auto newWidth = _maxWidth; auto newWidth = _maxWidth;
accumulate_min(newWidth, _padding.left() + _text.maxWidth() + _padding.right()); accumulate_min(newWidth, _padding.left() + _text.maxWidth() + _padding.right());
accumulate_min(newWidth, parentWidget()->width() - 2 * st::toastMinMargin); accumulate_min(newWidth, parentWidget()->width() - 2 * st::toastMinMargin);
_textWidth = newWidth - _padding.left() - _padding.right(); _textWidth = widthWithoutPadding(newWidth);
const auto textHeight = _multiline const auto textHeight = _multiline
? qMin(_text.countHeight(_textWidth), _maxTextHeight) ? qMin(_text.countHeight(_textWidth), _maxTextHeight)
: _text.minHeight(); : _text.minHeight();

4
Telegram/SourceFiles/ui/toast/toast_widget.h
View File

@ -28,6 +28,10 @@ protected:
void paintEvent(QPaintEvent *e) override; void paintEvent(QPaintEvent *e) override;
private: private:
inline int widthWithoutPadding(int w) {
return w - _padding.left() - _padding.right();
}
float64 _shownLevel = 0; float64 _shownLevel = 0;
bool _multiline = false; bool _multiline = false;
int _maxWidth = 0; int _maxWidth = 0;