diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-21 13:34:09 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-21 13:34:09 +0000 |
| commit | 1d1cb9be06ee80a0d3dbcc77561a7d173ff7a659 (patch) | |
| tree | cdfe988ec4cc479e3e69d3f297b8534ceece2eb3 /NxWidgets/nxwm/src | |
| parent | e4a79c57a116979c2cd74597e7c85d912ec6c10b (diff) | |
| download | px4-nuttx-1d1cb9be06ee80a0d3dbcc77561a7d173ff7a659.tar.gz px4-nuttx-1d1cb9be06ee80a0d3dbcc77561a7d173ff7a659.tar.bz2 px4-nuttx-1d1cb9be06ee80a0d3dbcc77561a7d173ff7a659.zip | |
Fix NxWM bug: old window being minimized when new window open
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4757 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/src')
| -rw-r--r-- | NxWidgets/nxwm/src/ckeyboard.cxx | 7 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/ctaskbar.cxx | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/NxWidgets/nxwm/src/ckeyboard.cxx b/NxWidgets/nxwm/src/ckeyboard.cxx index 6e9d7b818..0f3f11d37 100644 --- a/NxWidgets/nxwm/src/ckeyboard.cxx +++ b/NxWidgets/nxwm/src/ckeyboard.cxx @@ -36,11 +36,6 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ -#include <nuttx/config.h> // REMOVE ME -#define CONFIG_DEBUG 1 // REMOVE ME -#define CONFIG_DEBUG_VERBOSE 1 // REMOVE ME -#define CONFIG_DEBUG_GRAPHICS 1 // REMOVE ME -#include <debug.h> // REMOVE ME #include <nuttx/config.h> @@ -203,7 +198,7 @@ FAR void *CKeyboard::listener(FAR void *arg) uint8_t rxbuffer[CONFIG_NXWM_KEYBOARD_BUFSIZE]; ssize_t nbytes = read(This->m_kbdFd, rxbuffer, CONFIG_NXWM_KEYBOARD_BUFSIZE); -dbg("nbytes=%d\n"); // REMOVE ME + // Check for errors if (nbytes < 0) diff --git a/NxWidgets/nxwm/src/ctaskbar.cxx b/NxWidgets/nxwm/src/ctaskbar.cxx index 111d800e9..c494fcba3 100644 --- a/NxWidgets/nxwm/src/ctaskbar.cxx +++ b/NxWidgets/nxwm/src/ctaskbar.cxx @@ -506,8 +506,7 @@ bool CTaskbar::startApplication(IApplication *app, bool minimized) return false; } - // Has the window manager been started? Or were we ask to start - // the application minimized? + // Were we ask to start the application minimized? if (minimized) { @@ -551,11 +550,8 @@ bool CTaskbar::topApplication(IApplication *app) if (m_topApp) { - // Yes.. then minimize the application - - m_topApp->setMinimized(true); - - // And make the application non-visible + // Yes.. make the application non-visible (it is still maximized and + // will reappear when the window above it is minimized or closed). hideApplicationWindow(m_topApp); } |