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

crash fixed in InputField and InputArea

This commit is contained in:
John Preston 2015-10-14 23:47:23 +02:00
parent 6168f3334d
commit a94acdea53
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/boxes/addcontactbox.cpp
View File

@ -1168,6 +1168,7 @@ _saveTitleRequestId(0), _saveDescriptionRequestId(0) {
_title.setMaxLength(MaxGroupChannelTitle); _title.setMaxLength(MaxGroupChannelTitle);
_description.setMaxLength(MaxChannelDescription); _description.setMaxLength(MaxChannelDescription);
_description.resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(), _description.height()); _description.resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(), _description.height());
myEnsureResized(&_description);
updateMaxHeight(); updateMaxHeight();
connect(&_description, SIGNAL(resized()), this, SLOT(onDescriptionResized())); connect(&_description, SIGNAL(resized()), this, SLOT(onDescriptionResized()));

28
Telegram/SourceFiles/gui/flatinput.cpp
View File

@ -532,7 +532,7 @@ void PhonePartInput::onChooseCode(const QString &code) {
InputArea::InputArea(QWidget *parent, const style::InputArea &st, const QString &ph, const QString &val) : TWidget(parent), InputArea::InputArea(QWidget *parent, const style::InputArea &st, const QString &ph, const QString &val) : TWidget(parent),
_maxLength(-1), _maxLength(-1),
_inner(this, val), _inner(this),
_oldtext(val), _oldtext(val),
_undoAvailable(false), _undoAvailable(false),
@ -589,6 +589,8 @@ _correcting(false) {
_touchTimer.setSingleShot(true); _touchTimer.setSingleShot(true);
connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer())); connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer()));
connect(_inner.document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(onDocumentContentsChange(int,int,int)));
connect(_inner.document(), SIGNAL(contentsChanged()), this, SLOT(onDocumentContentsChanged()));
connect(&_inner, SIGNAL(undoAvailable(bool)), this, SLOT(onUndoAvailable(bool))); connect(&_inner, SIGNAL(undoAvailable(bool)), this, SLOT(onUndoAvailable(bool)));
connect(&_inner, SIGNAL(redoAvailable(bool)), this, SLOT(onRedoAvailable(bool))); connect(&_inner, SIGNAL(redoAvailable(bool)), this, SLOT(onRedoAvailable(bool)));
if (App::wnd()) connect(&_inner, SIGNAL(selectionChanged()), App::wnd(), SLOT(updateGlobalMenu())); if (App::wnd()) connect(&_inner, SIGNAL(selectionChanged()), App::wnd(), SLOT(updateGlobalMenu()));
@ -596,6 +598,9 @@ _correcting(false) {
setCursor(style::cur_text); setCursor(style::cur_text);
heightAutoupdated(); heightAutoupdated();
if (!val.isEmpty()) {
_inner.setPlainText(val);
}
_inner.document()->clearUndoRedoStacks(); _inner.document()->clearUndoRedoStacks();
} }
@ -630,12 +635,7 @@ void InputArea::checkContentHeight() {
} }
} }
InputArea::InputAreaInner::InputAreaInner(InputArea *parent, const QString &val) : QTextEdit(parent) { InputArea::InputAreaInner::InputAreaInner(InputArea *parent) : QTextEdit(parent) {
connect(document(), SIGNAL(contentsChange(int, int, int)), parent, SLOT(onDocumentContentsChange(int, int, int)));
connect(document(), SIGNAL(contentsChanged()), parent, SLOT(onDocumentContentsChanged()));
if (!val.isEmpty()) {
setPlainText(val);
}
} }
bool InputArea::InputAreaInner::viewportEvent(QEvent *e) { bool InputArea::InputAreaInner::viewportEvent(QEvent *e) {
@ -1201,7 +1201,7 @@ void InputArea::showError() {
InputField::InputField(QWidget *parent, const style::InputField &st, const QString &ph, const QString &val) : TWidget(parent), InputField::InputField(QWidget *parent, const style::InputField &st, const QString &ph, const QString &val) : TWidget(parent),
_maxLength(-1), _maxLength(-1),
_inner(this, val), _inner(this),
_oldtext(val), _oldtext(val),
_undoAvailable(false), _undoAvailable(false),
@ -1260,11 +1260,16 @@ _correcting(false) {
_touchTimer.setSingleShot(true); _touchTimer.setSingleShot(true);
connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer())); connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer()));
connect(_inner.document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(onDocumentContentsChange(int,int,int)));
connect(_inner.document(), SIGNAL(contentsChanged()), this, SLOT(onDocumentContentsChanged()));
connect(&_inner, SIGNAL(undoAvailable(bool)), this, SLOT(onUndoAvailable(bool))); connect(&_inner, SIGNAL(undoAvailable(bool)), this, SLOT(onUndoAvailable(bool)));
connect(&_inner, SIGNAL(redoAvailable(bool)), this, SLOT(onRedoAvailable(bool))); connect(&_inner, SIGNAL(redoAvailable(bool)), this, SLOT(onRedoAvailable(bool)));
if (App::wnd()) connect(&_inner, SIGNAL(selectionChanged()), App::wnd(), SLOT(updateGlobalMenu())); if (App::wnd()) connect(&_inner, SIGNAL(selectionChanged()), App::wnd(), SLOT(updateGlobalMenu()));
setCursor(style::cur_text); setCursor(style::cur_text);
if (!val.isEmpty()) {
_inner.setPlainText(val);
}
_inner.document()->clearUndoRedoStacks(); _inner.document()->clearUndoRedoStacks();
} }
@ -1272,12 +1277,7 @@ void InputField::onTouchTimer() {
_touchRightButton = true; _touchRightButton = true;
} }
InputField::InputFieldInner::InputFieldInner(InputField *parent, const QString &val) : QTextEdit(parent) { InputField::InputFieldInner::InputFieldInner(InputField *parent) : QTextEdit(parent) {
connect(document(), SIGNAL(contentsChange(int, int, int)), parent, SLOT(onDocumentContentsChange(int, int, int)));
connect(document(), SIGNAL(contentsChanged()), parent, SLOT(onDocumentContentsChanged()));
if (!val.isEmpty()) {
setPlainText(val);
}
} }
bool InputField::InputFieldInner::viewportEvent(QEvent *e) { bool InputField::InputFieldInner::viewportEvent(QEvent *e) {

4
Telegram/SourceFiles/gui/flatinput.h
View File

@ -263,7 +263,7 @@ private:
friend class InputAreaInner; friend class InputAreaInner;
class InputAreaInner : public QTextEdit { class InputAreaInner : public QTextEdit {
public: public:
InputAreaInner(InputArea *parent, const QString &val = QString()); InputAreaInner(InputArea *parent);
bool viewportEvent(QEvent *e); bool viewportEvent(QEvent *e);
void focusInEvent(QFocusEvent *e); void focusInEvent(QFocusEvent *e);
@ -431,7 +431,7 @@ private:
friend class InputFieldInner; friend class InputFieldInner;
class InputFieldInner : public QTextEdit { class InputFieldInner : public QTextEdit {
public: public:
InputFieldInner(InputField *parent, const QString &val = QString()); InputFieldInner(InputField *parent);
bool viewportEvent(QEvent *e); bool viewportEvent(QEvent *e);
void focusInEvent(QFocusEvent *e); void focusInEvent(QFocusEvent *e);