From 01c763c83d0c846164dcb5b69b9343e6ee2ac0b7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 21 Mar 2019 11:59:46 +0100 Subject: Fix tabbing in recipebrowser Fixes: QTBUG-55146 Change-Id: I034ebb3e65341b5424a24d5a143013d726d55e10 Reviewed-by: Alexandru Croitor --- examples/webengine/recipebrowser/resources/qml/RecipeList.qml | 2 +- examples/webengine/recipebrowser/resources/qml/main.qml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'examples/webengine') diff --git a/examples/webengine/recipebrowser/resources/qml/RecipeList.qml b/examples/webengine/recipebrowser/resources/qml/RecipeList.qml index 24be23a64..41806986c 100644 --- a/examples/webengine/recipebrowser/resources/qml/RecipeList.qml +++ b/examples/webengine/recipebrowser/resources/qml/RecipeList.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 2.0 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.0 diff --git a/examples/webengine/recipebrowser/resources/qml/main.qml b/examples/webengine/recipebrowser/resources/qml/main.qml index 2639b6b5d..a9893ed67 100644 --- a/examples/webengine/recipebrowser/resources/qml/main.qml +++ b/examples/webengine/recipebrowser/resources/qml/main.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQml 2.0 -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 2.0 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.0 @@ -98,7 +98,7 @@ ApplicationWindow { Layout.fillWidth: true Layout.fillHeight: true focus: true - KeyNavigation.tab: webView + activeFocusOnTab: true onRecipeSelected: function(url) { webView.showRecipe(url) } @@ -109,8 +109,6 @@ ApplicationWindow { Layout.preferredWidth: 2 * parent.width / 3 Layout.fillWidth: true Layout.fillHeight: true - KeyNavigation.tab: recipeList - KeyNavigation.priority: KeyNavigation.BeforeItem // Make sure focus is not taken by the web view, so user can continue navigating // recipes with the keyboard. settings.focusOnNavigationEnabled: false -- cgit v1.2.3 From 54ac91fd60ba0e84be239cefa1b56a489c420f9e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 21 Mar 2019 12:54:09 +0100 Subject: Fix markdown rendering of titles in recipebrowser Apparently not having a newline before each recipe title, prevented the markdown JS renderer from rendering the titles properly, instead the titles wee unformatted and also displayed the = signs. Add the new lines. Change-Id: I8176e8f3029ca2e80114d6555bbb73696ba51509 Reviewed-by: Allan Sandfeld Jensen --- examples/webengine/recipebrowser/resources/pages/burger.html | 1 + examples/webengine/recipebrowser/resources/pages/cupcakes.html | 1 + examples/webengine/recipebrowser/resources/pages/pasta.html | 1 + examples/webengine/recipebrowser/resources/pages/pizza.html | 1 + examples/webengine/recipebrowser/resources/pages/skewers.html | 1 + examples/webengine/recipebrowser/resources/pages/soup.html | 1 + examples/webengine/recipebrowser/resources/pages/steak.html | 1 + 7 files changed, 7 insertions(+) (limited to 'examples/webengine') diff --git a/examples/webengine/recipebrowser/resources/pages/burger.html b/examples/webengine/recipebrowser/resources/pages/burger.html index b10170cbd..6651cc0f0 100644 --- a/examples/webengine/recipebrowser/resources/pages/burger.html +++ b/examples/webengine/recipebrowser/resources/pages/burger.html @@ -11,6 +11,7 @@
Insanity Burger + Insanity burger =============== diff --git a/examples/webengine/recipebrowser/resources/pages/cupcakes.html b/examples/webengine/recipebrowser/resources/pages/cupcakes.html index e21247825..4791c7ffa 100644 --- a/examples/webengine/recipebrowser/resources/pages/cupcakes.html +++ b/examples/webengine/recipebrowser/resources/pages/cupcakes.html @@ -11,6 +11,7 @@
Cupcakes + Cupcakes ============= diff --git a/examples/webengine/recipebrowser/resources/pages/pasta.html b/examples/webengine/recipebrowser/resources/pages/pasta.html index 4de65292e..41ed1a756 100644 --- a/examples/webengine/recipebrowser/resources/pages/pasta.html +++ b/examples/webengine/recipebrowser/resources/pages/pasta.html @@ -11,6 +11,7 @@
Pasta + Pasta ============= diff --git a/examples/webengine/recipebrowser/resources/pages/pizza.html b/examples/webengine/recipebrowser/resources/pages/pizza.html index c63102934..348d809e8 100644 --- a/examples/webengine/recipebrowser/resources/pages/pizza.html +++ b/examples/webengine/recipebrowser/resources/pages/pizza.html @@ -11,6 +11,7 @@
Pizza Diavola + Pizza Diavola ============= diff --git a/examples/webengine/recipebrowser/resources/pages/skewers.html b/examples/webengine/recipebrowser/resources/pages/skewers.html index 6fbf90cb4..aca4c4859 100644 --- a/examples/webengine/recipebrowser/resources/pages/skewers.html +++ b/examples/webengine/recipebrowser/resources/pages/skewers.html @@ -11,6 +11,7 @@
Grilled skewers + Grilled skewers ====================== diff --git a/examples/webengine/recipebrowser/resources/pages/soup.html b/examples/webengine/recipebrowser/resources/pages/soup.html index e99f016cf..1b7027e5d 100644 --- a/examples/webengine/recipebrowser/resources/pages/soup.html +++ b/examples/webengine/recipebrowser/resources/pages/soup.html @@ -11,6 +11,7 @@
Soup + Soup ============= diff --git a/examples/webengine/recipebrowser/resources/pages/steak.html b/examples/webengine/recipebrowser/resources/pages/steak.html index c58395d10..a56313e27 100644 --- a/examples/webengine/recipebrowser/resources/pages/steak.html +++ b/examples/webengine/recipebrowser/resources/pages/steak.html @@ -11,6 +11,7 @@
Grilled steak and rice + Grilled steak and rice ====================== -- cgit v1.2.3