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

Allow to resize chats list. One more mode added (narrow chats list).

Browse Source
This commit is contained in:
John Preston
2017-01-14 21:50:16 +03:00
parent 983db3a682
commit 4424dbf64a
33 changed files with 558 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Telegram/SourceFiles/ui/widgets/input_fields.cpp
View File

@@ -339,7 +339,7 @@ void FlatTextarea::paintEvent(QPaintEvent *e) {
p.save();
p.setClipRect(r);
p.setFont(_st.font);
p.setPen(anim::pen(_st.phColor, _st.phFocusColor, _a_placeholderFocused.current(ms, hasFocus() ? 1. : 0.)));
p.setPen(anim::pen(_st.phColor, _st.phFocusColor, _a_placeholderFocused.current(ms, _focused ? 1. : 0.)));
if (_st.phAlign == style::al_topleft && _phAfter > 0) {
int skipWidth = placeholderSkipWidth();
p.drawText(_st.textMrg.left() - _fakeMargin + placeholderLeft + skipWidth, _st.textMrg.top() - _fakeMargin - st::lineWidth + _st.font->ascent, _ph);
@@ -366,12 +366,20 @@ int FlatTextarea::placeholderSkipWidth() const {
}
void FlatTextarea::focusInEvent(QFocusEvent *e) {
_a_placeholderFocused.start([this] { update(); }, 0., 1., _st.phDuration);
if (!_focused) {
_focused = true;
_a_placeholderFocused.start([this] { update(); }, 0., 1., _st.phDuration);
update();
}
QTextEdit::focusInEvent(e);
}
void FlatTextarea::focusOutEvent(QFocusEvent *e) {
_a_placeholderFocused.start([this] { update(); }, 1., 0., _st.phDuration);
if (_focused) {
_focused = false;
_a_placeholderFocused.start([this] { update(); }, 1., 0., _st.phDuration);
update();
}
QTextEdit::focusOutEvent(e);
}
@@ -1559,7 +1567,7 @@ void FlatInput::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = getms();
auto placeholderFocused = _a_placeholderFocused.current(ms, hasFocus() ? 1. : 0.);
auto placeholderFocused = _a_placeholderFocused.current(ms, _focused ? 1. : 0.);
auto pen = anim::pen(_st.borderColor, _st.borderActive, placeholderFocused);
pen.setWidth(_st.borderWidth);
@@ -1592,13 +1600,21 @@ void FlatInput::paintEvent(QPaintEvent *e) {
}
void FlatInput::focusInEvent(QFocusEvent *e) {
_a_placeholderFocused.start([this] { update(); }, 0., 1., _st.phDuration);
if (!_focused) {
_focused = true;
_a_placeholderFocused.start([this] { update(); }, 0., 1., _st.phDuration);
update();
}
QLineEdit::focusInEvent(e);
emit focused();
}
void FlatInput::focusOutEvent(QFocusEvent *e) {
_a_placeholderFocused.start([this] { update(); }, 1., 0., _st.phDuration);
if (_focused) {
_focused = false;
_a_placeholderFocused.start([this] { update(); }, 1., 0., _st.phDuration);
update();
}
QLineEdit::focusOutEvent(e);
emit blurred();
}

2
Telegram/SourceFiles/ui/widgets/input_fields.h
View File

@@ -191,6 +191,7 @@ private:
QString _ph, _phelided;
int _phAfter = 0;
bool _focused = false;
bool _placeholderVisible = true;
Animation _a_placeholderFocused;
Animation _a_placeholderVisible;
@@ -313,6 +314,7 @@ private:
bool _customUpDown = false;
bool _focused = false;
bool _placeholderVisible = true;
Animation _a_placeholderFocused;
Animation _a_placeholderVisible;