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

Fix pen reset in TextPainter of empty text.

This commit is contained in:
John Preston 2018-10-29 18:05:29 +04:00
parent 8c1e546123
commit 885e7f0471
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/ui/text/text.cpp
View File

@ -844,7 +844,10 @@ static void eAppendItems(QScriptAnalysis *analysis, int &start, int &stop, const
class TextPainter { class TextPainter {
public: public:
TextPainter(Painter *p, const Text *t) : _p(p), _t(t) { TextPainter(Painter *p, const Text *t)
: _p(p)
, _t(t)
, _originalPen(p ? p->pen() : QPen()) {
} }
~TextPainter() { ~TextPainter() {
@ -861,7 +864,6 @@ public:
if (_p) { if (_p) {
_p->setFont(_t->_st->font); _p->setFont(_t->_st->font);
_textPalette = &_p->textPalette(); _textPalette = &_p->textPalette();
_originalPen = _p->pen();
_originalPenSelected = (_textPalette->selectFg->c.alphaF() == 0) ? _originalPen : _textPalette->selectFg->p; _originalPenSelected = (_textPalette->selectFg->c.alphaF() == 0) ? _originalPen : _textPalette->selectFg->p;
} }
@ -2409,7 +2411,7 @@ private:
bool _breakEverywhere = false; bool _breakEverywhere = false;
int _elideRemoveFromEnd = 0; int _elideRemoveFromEnd = 0;
style::align _align = style::al_topleft; style::align _align = style::al_topleft;
QPen _originalPen; const QPen _originalPen;
QPen _originalPenSelected; QPen _originalPenSelected;
const QPen *_currentPen = nullptr; const QPen *_currentPen = nullptr;
const QPen *_currentPenSelected = nullptr; const QPen *_currentPenSelected = nullptr;