summaryrefslogtreecommitdiff
path: root/NxWidgets
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-14 21:57:38 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-14 21:57:38 +0000
commit5d5fb0b5646aed4cb074eb317fc09170645c7a3f (patch)
treeaed7b7c4f84c4b2016b606b390e818023d2c3841 /NxWidgets
parent8c194ec17b4fc4810bde451e803d9cb29db28e59 (diff)
downloadpx4-nuttx-5d5fb0b5646aed4cb074eb317fc09170645c7a3f.tar.gz
px4-nuttx-5d5fb0b5646aed4cb074eb317fc09170645c7a3f.tar.bz2
px4-nuttx-5d5fb0b5646aed4cb074eb317fc09170645c7a3f.zip
Improved thresholding logic in the STMPE11 driver; NxWM: Oops minimizing wrong application
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4737 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets')
-rwxr-xr-xNxWidgets/ChangeLog.txt1
-rw-r--r--NxWidgets/nxwm/src/capplicationwindow.cxx2
-rw-r--r--NxWidgets/nxwm/src/cnxconsole.cxx2
-rw-r--r--NxWidgets/nxwm/src/ctaskbar.cxx4
4 files changed, 5 insertions, 4 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt
index 5b14799bd..b6d2cf9f8 100755
--- a/NxWidgets/ChangeLog.txt
+++ b/NxWidgets/ChangeLog.txt
@@ -83,3 +83,4 @@
these: Now support method to report if the application is a full-screen
or a normal application. This is necessary to prevent CTaskbar from
displaying a task bar on top of a full-screen window.
+* NxWM::CTaskbar: Ooops... minimizing the wrong application!
diff --git a/NxWidgets/nxwm/src/capplicationwindow.cxx b/NxWidgets/nxwm/src/capplicationwindow.cxx
index 60ab5a3d3..320559ef7 100644
--- a/NxWidgets/nxwm/src/capplicationwindow.cxx
+++ b/NxWidgets/nxwm/src/capplicationwindow.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <nuttx/nx/nxglib.h>
diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx
index 264845a03..0d0f8e60e 100644
--- a/NxWidgets/nxwm/src/cnxconsole.cxx
+++ b/NxWidgets/nxwm/src/cnxconsole.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <cstdio>
diff --git a/NxWidgets/nxwm/src/ctaskbar.cxx b/NxWidgets/nxwm/src/ctaskbar.cxx
index 3305b945b..b15916b0a 100644
--- a/NxWidgets/nxwm/src/ctaskbar.cxx
+++ b/NxWidgets/nxwm/src/ctaskbar.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <debug.h>
@@ -521,7 +521,7 @@ bool CTaskbar::topApplication(IApplication *app)
{
// Yes.. then minimize the application
- app->setMinimized(true);
+ m_topApp->setMinimized(true);
// And make the application non-visible