* Enhance how controls are shown:
- Hide controls before showing them so that they will persist in
the foreground.
* Remove OpenGL button
- This feature does not work properly.
Signed-off-by: Jacob Stiffler <[email protected]>
---
.../0001-deform-Fix-how-controls-are-shown.patch | 33 ++++++++++
.../qtbase/0002-deform-disable-opengl-button.patch | 71 ++++++++++++++++++++++
.../recipes-qt/qt5/qtbase_5.4.1.bbappend | 4 +-
3 files changed, 107 insertions(+), 1 deletion(-)
create mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase/0001-deform-Fix-how-controls-are-shown.patch
create mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase/0002-deform-disable-opengl-button.patch
diff --git
a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-deform-Fix-how-controls-are-shown.patch
b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-deform-Fix-how-controls-are-shown.patch
new file mode 100644
index 0000000..076beca
--- /dev/null
+++
b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-deform-Fix-how-controls-are-shown.patch
@@ -0,0 +1,33 @@
+From adad036a785f6b3910e6305181e7711c2bac0df6 Mon Sep 17 00:00:00 2001
+From: Jacob Stiffler <[email protected]>
+Date: Fri, 12 Jun 2015 08:34:17 -0400
+Subject: [PATCH 1/2] deform: Fix how controls are shown.
+
+* Workaround for issue when controls are full screen, and user clicks
+ OK, black surface remains covering the entire screen.
+* If controls are not full screen, then they must retain focus while
+ opened.
+
+Signed-off-by: Jacob Stiffler <[email protected]>
+---
+ examples/widgets/painting/deform/pathdeform.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/examples/widgets/painting/deform/pathdeform.cpp
b/examples/widgets/painting/deform/pathdeform.cpp
+index 287f700..f8ecc3b 100644
+--- a/examples/widgets/painting/deform/pathdeform.cpp
++++ b/examples/widgets/painting/deform/pathdeform.cpp
+@@ -266,7 +266,9 @@ PathDeformWidget::PathDeformWidget(QWidget *parent, bool
smallScreen)
+
+ void PathDeformWidget::showControls()
+ {
+- m_controls->showFullScreen();
++ // Hide first to keep controls in foreground.
++ m_controls->hide();
++ m_controls->show();
+ }
+
+ void PathDeformWidget::hideControls()
+--
+1.7.9.5
+
diff --git
a/meta-arago-distro/recipes-qt/qt5/qtbase/0002-deform-disable-opengl-button.patch
b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-deform-disable-opengl-button.patch
new file mode 100644
index 0000000..b15324b
--- /dev/null
+++
b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-deform-disable-opengl-button.patch
@@ -0,0 +1,71 @@
+From 066333592c77ef831286482c7d3636265777a774 Mon Sep 17 00:00:00 2001
+From: Jacob Stiffler <[email protected]>
+Date: Fri, 12 Jun 2015 10:24:33 -0400
+Subject: [PATCH 2/2] deform: disable opengl button.
+
+Signed-off-by: Jacob Stiffler <[email protected]>
+---
+ examples/widgets/painting/deform/pathdeform.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/examples/widgets/painting/deform/pathdeform.cpp
b/examples/widgets/painting/deform/pathdeform.cpp
+index f8ecc3b..9da6bf3 100644
+--- a/examples/widgets/painting/deform/pathdeform.cpp
++++ b/examples/widgets/painting/deform/pathdeform.cpp
+@@ -91,7 +91,7 @@ void PathDeformControls::layoutForDesktop()
+ QPushButton *showSourceButton = new QPushButton(mainGroup);
+ showSourceButton->setText(tr("Show Source"));
+
+-#ifdef QT_OPENGL_SUPPORT
++#if 0
+ QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+ enableOpenGLButton->setText(tr("Use OpenGL"));
+ enableOpenGLButton->setCheckable(true);
+@@ -114,7 +114,7 @@ void PathDeformControls::layoutForDesktop()
+ mainGroupLayout->addWidget(textGroup);
+ mainGroupLayout->addWidget(animateButton);
+ mainGroupLayout->addStretch(1);
+-#ifdef QT_OPENGL_SUPPORT
++#if 0
+ mainGroupLayout->addWidget(enableOpenGLButton);
+ #endif
+ mainGroupLayout->addWidget(showSourceButton);
+@@ -140,7 +140,7 @@ void PathDeformControls::layoutForDesktop()
+ connect(deformSlider, SIGNAL(valueChanged(int)), m_renderer,
SLOT(setIntensity(int)));
+ connect(fontSizeSlider, SIGNAL(valueChanged(int)), m_renderer,
SLOT(setFontSize(int)));
+ connect(animateButton, SIGNAL(clicked(bool)), m_renderer,
SLOT(setAnimated(bool)));
+-#ifdef QT_OPENGL_SUPPORT
++#if 0
+ connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer,
SLOT(enableOpenGL(bool)));
+ #endif
+
+@@ -183,7 +183,7 @@ void PathDeformControls::layoutForSmallScreen()
+ QPushButton *animateButton = new QPushButton(tr("Animated"), mainGroup);
+ animateButton->setCheckable(true);
+
+-#ifdef QT_OPENGL_SUPPORT
++#if 0
+ QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
+ enableOpenGLButton->setText(tr("Use OpenGL"));
+ enableOpenGLButton->setCheckable(mainGroup);
+@@ -205,7 +205,7 @@ void PathDeformControls::layoutForSmallScreen()
+ mainGroupLayout->addWidget(fontSizeLabel, 2, 0, Qt::AlignRight);
+ mainGroupLayout->addWidget(fontSizeSlider, 2, 1);
+ mainGroupLayout->addWidget(animateButton, 3,0, 1,2);
+-#ifdef QT_OPENGL_SUPPORT
++#if 0
+ mainGroupLayout->addWidget(enableOpenGLButton, 4,0, 1,2);
+ #endif
+
+@@ -221,7 +221,7 @@ void PathDeformControls::layoutForSmallScreen()
+ connect(deformSlider, SIGNAL(valueChanged(int)), m_renderer,
SLOT(setIntensity(int)));
+ connect(fontSizeSlider, SIGNAL(valueChanged(int)), m_renderer,
SLOT(setFontSize(int)));
+ connect(animateButton, SIGNAL(clicked(bool)), m_renderer,
SLOT(setAnimated(bool)));
+-#ifdef QT_OPENGL_SUPPORT
++#if 0
+ connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer,
SLOT(enableOpenGL(bool)));
+ #endif
+
+--
+1.7.9.5
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
index 412bf67..d6e3f4d 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
@@ -5,7 +5,7 @@ GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland"
PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl
${GLES_EXTRA_DEPS}"
-PR_append = "-arago6"
+PR_append = "-arago7"
QT_CONFIG_FLAGS += "-qpa ${@base_contains('DISTRO_FEATURES', 'wayland',
'wayland', 'eglfs', d)}"
@@ -21,6 +21,8 @@ QT_ENV_ti33x = "${@base_contains('DISTRO_FEATURES',
'wayland', 'qt_env.sh', 'qt_
SRC_URI += "\
file://${QT_ENV} \
${@base_contains('DISTRO_FEATURES', 'wayland', '', "${QT_EGLFS_PATCHES}",
d)}\
+ file://0001-deform-Fix-how-controls-are-shown.patch \
+ file://0002-deform-disable-opengl-button.patch \
"
python do_patch_append() {
--
1.9.1
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
