diff options
Diffstat (limited to 'NxWidgets/nxwm')
| -rw-r--r-- | NxWidgets/nxwm/include/cnxconsole.hxx | 12 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/ccalibration.cxx | 3 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/ctaskbar.cxx | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/NxWidgets/nxwm/include/cnxconsole.hxx b/NxWidgets/nxwm/include/cnxconsole.hxx index 7682e6620..1c7aab193 100644 --- a/NxWidgets/nxwm/include/cnxconsole.hxx +++ b/NxWidgets/nxwm/include/cnxconsole.hxx @@ -102,12 +102,6 @@ namespace NxWM void close(void); - /** - * CNxConsole destructor - */ - - ~CNxConsole(void); - public: /** * CNxConsole constructor @@ -121,6 +115,12 @@ namespace NxWM CNxConsole(CTaskbar *taskbar, CApplicationWindow *window); /** + * CNxConsole destructor + */ + + ~CNxConsole(void); + + /** * Each implementation of IApplication must provide a method to recover * the contained CApplicationWindow instance. */ 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, |