Skip to content

Correct width with native paddings and hint text. Wrap editorAction for QML use #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Correct width with native paddings and hint text. Wrap editorAction for QML use #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44d2a84
Correct width with native paddings and hint text. Wrap editorAction f…
Sharm Apr 9, 2017
88a282b
Same for height
Sharm Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions QtOffscreenViews/QQuickViews/QQuickOffscreenEditText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ QQuickAndroidOffscreenEditText::QQuickAndroidOffscreenEditText()
connect(androidEditText(), SIGNAL(onTextChanged(QString,int,int,int)), this, SLOT(etTextChanged(QString,int,int,int)));
connect(androidEditText(), SIGNAL(onKeyBack(bool)), this, SLOT(etKeyBack(bool)));
connect(androidEditText(), SIGNAL(onEnterOrPositiveAction()), this, SLOT(etEnter()));
connect(androidEditText(), SIGNAL(onEditorAction(int)), this, SIGNAL(editorAction(int)));

connect(this, &QQuickItem::widthChanged, [this](){
androidEditText()->setWidth(width());
});

connect(this, &QQuickItem::heightChanged, [this](){
androidEditText()->setHeight(height());
});
}

void QQuickAndroidOffscreenEditText::etTextChanged(QString text, int start, int before, int count)
Expand Down
2 changes: 1 addition & 1 deletion QtOffscreenViews/QQuickViews/QQuickOffscreenEditText.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ public slots:

//! Wraps QAndroidOffscreenEditText::onEnterOrPositiveAction().
void returnPressed();

void backPressed();
void editorAction(int action);

protected slots:
virtual void etTextChanged(QString text, int start, int before, int count);
Expand Down