diff options
| author | Florin Sarbu <florin.sarbu@windriver.com> | 2014-10-14 14:39:23 +0300 |
|---|---|---|
| committer | Holger Behrens <holger.behrens@windriver.com> | 2014-10-17 17:29:15 +0200 |
| commit | 9cbeceebd3ee2369c9a7b60a4290553cab7a078a (patch) | |
| tree | 6c69ec762a03f964316c28399360ccaf07c99684 | |
| parent | 021b9196a0449b92ca2c50a62e8c83c408ac8e67 (diff) | |
| download | meta-ivi-9cbeceebd3ee2369c9a7b60a4290553cab7a078a.tar.gz meta-ivi-9cbeceebd3ee2369c9a7b60a4290553cab7a078a.tar.bz2 meta-ivi-9cbeceebd3ee2369c9a7b60a4290553cab7a078a.zip | |
Hacks for weston and browser-poc
Added one browser-poc patch that diminishes the size of the bookmarks window.
The qml window for bookmarks is contained into a 0, 0, 1024, 80 rectangle and for
now we cannot dynamically change it's size. For this reason, we resize the bookmarks window.
Added one weston patch that modifies the tiling of windows so that we can properly show the
browser-poc which is comprised of 2 windows: one for address, back and forward button, bookmarks
and the other window which does the rendering.
Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
4 files changed, 37 insertions, 0 deletions
diff --git a/meta-ivi-demo/recipes-extended/browser-poc/browser-poc-git/browser_poc_smaller_bookmarks_qml.patch b/meta-ivi-demo/recipes-extended/browser-poc/browser-poc-git/browser_poc_smaller_bookmarks_qml.patch new file mode 100644 index 0000000..43c33ab --- /dev/null +++ b/meta-ivi-demo/recipes-extended/browser-poc/browser-poc-git/browser_poc_smaller_bookmarks_qml.patch @@ -0,0 +1,13 @@ +Index: git/demoui/qtquick2applicationviewer/qtquick2applicationviewer.cpp +=================================================================== +--- git.orig/demoui/qtquick2applicationviewer/qtquick2applicationviewer.cpp 2014-10-14 14:34:52.967798427 +0300 ++++ git/demoui/qtquick2applicationviewer/qtquick2applicationviewer.cpp 2014-10-14 14:35:44.815796911 +0300 +@@ -69,7 +69,7 @@ + + void QtQuick2ApplicationViewer::changeGeometry(bool open) { + if(open) +- setGeometry(0, 0, 1024, 768); ++ setGeometry(0, 0, 1024, 256); + else + setGeometry(0, 0, 1024, 80); + } diff --git a/meta-ivi-demo/recipes-extended/browser-poc/browser-poc_git.bb b/meta-ivi-demo/recipes-extended/browser-poc/browser-poc_git.bb index bcb9699..fd8a762 100644 --- a/meta-ivi-demo/recipes-extended/browser-poc/browser-poc_git.bb +++ b/meta-ivi-demo/recipes-extended/browser-poc/browser-poc_git.bb @@ -10,6 +10,7 @@ SRCREV = "531bd41d00509840cf5dfc767995549c27211341" DEPENDS = "qtbase qtwebkit" SRC_URI = "git://git.projects.genivi.org/browser-poc.git \ + file://browser_poc_smaller_bookmarks_qml.patch \ file://COPYING \ " diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/browser_poc_hack.patch b/meta-ivi-demo/recipes-graphics/wayland/weston/browser_poc_hack.patch new file mode 100644 index 0000000..9aba5a5 --- /dev/null +++ b/meta-ivi-demo/recipes-graphics/wayland/weston/browser_poc_hack.patch @@ -0,0 +1,22 @@ +Index: weston-1.5.0/ivi-shell/hmi-controller.c +=================================================================== +--- weston-1.5.0.orig/ivi-shell/hmi-controller.c 2014-10-14 14:24:03.355817421 +0300 ++++ weston-1.5.0/ivi-shell/hmi-controller.c 2014-10-14 14:16:51.000000000 +0300 +@@ -264,8 +264,15 @@ + surface_x = (int32_t)((num - 5) * (surface_width)); + surface_y = (int32_t)surface_height; + } +- ret = ivi_layout_surfaceSetDestinationRectangle(ivisurf, surface_x, surface_y, +- surface_width, surface_height); ++// ret = ivi_layout_surfaceSetDestinationRectangle(ivisurf, surface_x, surface_y, ++// surface_width, surface_height); ++ ++ if (num == 1) ++ ret = ivi_layout_surfaceSetDestinationRectangle(ivisurf, 0, 0, 1024, 80); ++ ++ if (num != 1) ++ ret = ivi_layout_surfaceSetDestinationRectangle(ivisurf, 0, 80, 1024, 618); ++ + assert(!ret); + + ret = ivi_layout_surfaceSetVisibility(ivisurf, 1); diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend b/meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend index 6e60f4a..75f7dff 100644 --- a/meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend +++ b/meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend @@ -6,6 +6,7 @@ SRC_URI_append = " file://weston_ini.patch \ file://GDP_Background.png \ file://GDP_Browser_Button.png \ file://start_browser-poc.sh \ + file://browser_poc_hack.patch \ " do_install_append() { |