summaryrefslogtreecommitdiff
path: root/NxWidgets/nxwm/src
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-10 16:25:56 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-10 16:25:56 +0000
commit68f3044b5099572850a9e81a1c63161c20809547 (patch)
tree1160b821f035a4e90a5ed6472800e6d7e03468b8 /NxWidgets/nxwm/src
parent2bfda8161a877d7e618a37353f806981c0ab4a4b (diff)
downloadnuttx-68f3044b5099572850a9e81a1c63161c20809547.tar.gz
nuttx-68f3044b5099572850a9e81a1c63161c20809547.tar.bz2
nuttx-68f3044b5099572850a9e81a1c63161c20809547.zip
NX trapezoid fixes; Various NxWM fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4720 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/src')
-rw-r--r--NxWidgets/nxwm/src/ccalibration.cxx3
-rw-r--r--NxWidgets/nxwm/src/ctaskbar.cxx6
2 files changed, 9 insertions, 0 deletions
diff --git a/NxWidgets/nxwm/src/ccalibration.cxx b/NxWidgets/nxwm/src/ccalibration.cxx
index e218b5f1e..6e66f3028 100644
--- a/NxWidgets/nxwm/src/ccalibration.cxx
+++ b/NxWidgets/nxwm/src/ccalibration.cxx
@@ -177,6 +177,9 @@ bool CCalibration::run(void)
void CCalibration::stop(void)
{
+ // The main thread is stuck waiting for the next touchscreen input...
+ // So this is probably just a waste of good FLASH space.
+
m_stop = true;
}
diff --git a/NxWidgets/nxwm/src/ctaskbar.cxx b/NxWidgets/nxwm/src/ctaskbar.cxx
index 34bf53d1a..9edb3fff5 100644
--- a/NxWidgets/nxwm/src/ctaskbar.cxx
+++ b/NxWidgets/nxwm/src/ctaskbar.cxx
@@ -886,6 +886,12 @@ bool CTaskbar::redrawTaskbarWindow(void)
return false;
}
+ // Raise the task bar to the top of the display. This is only necessary
+ // after stopping a full screen application. Other applications do not
+ // overlap the task bar and, hence, do not interfere.
+
+ m_taskbar->raise();
+
// Fill the entire window with the background color
port->drawFilledRect(0, 0, windowSize.w, windowSize.h,