Skip to content
This repository has been archived by the owner on Jan 22, 2022. It is now read-only.

update addressbar.text via timer #365

Open
wants to merge 3 commits into
base: xenial
Choose a base branch
from
Open

update addressbar.text via timer #365

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
001c2c8
update addressbar.text via timer, so that the textfield is blocked wh…
balcy Jul 8, 2020
0163a04
Update AddressBar.qml
balcy Nov 25, 2020
b4a607e
clear the search results when the user starts typing
balcy Jan 31, 2021
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
95 changes: 60 additions & 35 deletions src/app/webbrowser/AddressBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ FocusScope {

property alias icon: favicon.source
property bool incognito: false
property alias text: textField.text
property string text
property bool bookmarked: false
signal toggleBookmark()
property url requestedUrl
Expand Down Expand Up @@ -73,12 +73,25 @@ FocusScope {
value: findInPageMode ? textField.text : ""
}

Timer {
id: searchTextTimer
onTriggered: (addressbar.text = textField.text)
interval: 900
}

TextField {
id: textField
objectName: "addressBarTextField"

anchors.fill: parent

onTextChanged: {
if (editing) {
addressbar.text = "";
searchTextTimer.restart();
}
}

primaryItem: Item {
id: icons

Expand Down Expand Up @@ -423,13 +436,14 @@ FocusScope {
}

function validate() {
var query = text.trim()
text = textField.text;
var query = text.trim();
if (UrlUtils.looksLikeAUrl(query)) {
requestedUrl = UrlUtils.fixUrl(query)
requestedUrl = UrlUtils.fixUrl(query);
} else {
requestedUrl = internal.buildSearchUrl(query)
requestedUrl = internal.buildSearchUrl(query);
}
validated()
validated();
}

function simplifyUrl(url) {
Expand Down Expand Up @@ -471,68 +485,79 @@ FocusScope {

onIncognitoChanged: {
if (incognito) {
text = ""
internal.simplified = false
textField.text = "";
internal.simplified = false;
}
}

onEditingChanged: {
if (findInPageMode) return
if (findInPageMode) {
return;
}
if (editing && internal.simplified) {
text = actualUrl
internal.simplified = false
textField.text = actualUrl;
internal.simplified = false;
} else if (!editing) {
if (canSimplifyText && !loading && actualUrl.toString()) {
text = internal.simplifyUrl(actualUrl)
internal.simplified = true
textField.text = internal.simplifyUrl(actualUrl);
internal.simplified = true;
} else {
text = actualUrl
internal.simplified = false
textField.text = actualUrl;
internal.simplified = false;
}
}
}

onCanSimplifyTextChanged: {
if (editing || findInPageMode) return
if (editing || findInPageMode) {
return;
}
if (canSimplifyText && !loading && actualUrl.toString()) {
text = internal.simplifyUrl(actualUrl)
internal.simplified = true
textField.text = internal.simplifyUrl(actualUrl);
internal.simplified = true;
} else if (!canSimplifyText && internal.simplified) {
text = actualUrl
internal.simplified = false
textField.text = actualUrl;
internal.simplified = false;
}
}

onActualUrlChanged: {
if (editing || findInPageMode) return
if (editing || findInPageMode) {
return;
}
if (canSimplifyText) {
text = internal.simplifyUrl(actualUrl)
internal.simplified = true
textField.text = internal.simplifyUrl(actualUrl);
internal.simplified = true;
} else {
text = actualUrl
internal.simplified = false
textField.text = actualUrl;
internal.simplified = false;
}
}

onRequestedUrlChanged: {
if (editing || findInPageMode) return
if (editing || findInPageMode) {
return;
}
if (canSimplifyText) {
text = internal.simplifyUrl(requestedUrl)
internal.simplified = true
textField.text = internal.simplifyUrl(requestedUrl);
internal.simplified = true;
} else {
text = requestedUrl
internal.simplified = false
textField.text = requestedUrl;
internal.simplified = false;
}
}

onFindInPageModeChanged: {
if (findInPageMode) return
if (canSimplifyText) {
text = internal.simplifyUrl(actualUrl)
internal.simplified = true
if (findInPageMode) {
textField.text = "";
} else if (canSimplifyText) {
textField.text = internal.simplifyUrl(actualUrl);
addressbar.text = textField.text;
internal.simplified = true;
} else {
text = actualUrl
internal.simplified = false
textField.text = actualUrl;
addressbar.text = textField.text;
internal.simplified = false;
}
}

Expand Down