From 7525149138b8aa7b122683a55ef7b75f010995c6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 4 Jun 2013 08:11:45 -0600 Subject: NxWM::CTaskbar: Add a method to redraw the task bar and the top application. From Petteri Aimonen --- NxWidgets/ChangeLog.txt | 4 ++++ NxWidgets/libnxwidgets/src/cnumericedit.cxx | 2 +- NxWidgets/nxwm/include/ctaskbar.hxx | 24 ++++++++++++++++-------- 3 files changed, 21 insertions(+), 9 deletions(-) (limited to 'NxWidgets') diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 93112b7a0..95a899011 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -374,4 +374,8 @@ * NxWidgets::CNumericEdit: Delay before auto-incrementing now varies: A longer delay is required to start auto-incrementing and speed increases while pressed. From Petteri Aimonen (2013-6-4). +* NxWM::CTaskbar: Add a method to redraw the taskbar and the current + application. This should only be necessary if the display loses + state due to e.g. powerdown or other manual intervention. From + Petteri Aimonen (2013-6-4). diff --git a/NxWidgets/libnxwidgets/src/cnumericedit.cxx b/NxWidgets/libnxwidgets/src/cnumericedit.cxx index 4a1f6a0e2..5030e782b 100644 --- a/NxWidgets/libnxwidgets/src/cnumericedit.cxx +++ b/NxWidgets/libnxwidgets/src/cnumericedit.cxx @@ -1,7 +1,7 @@ /**************************************************************************** * NxWidgets/libnxwidgets/include/cnumericedit.cxx * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * Petteri Aimonen * diff --git a/NxWidgets/nxwm/include/ctaskbar.hxx b/NxWidgets/nxwm/include/ctaskbar.hxx index 229e78b22..84c7b28f4 100644 --- a/NxWidgets/nxwm/include/ctaskbar.hxx +++ b/NxWidgets/nxwm/include/ctaskbar.hxx @@ -1,7 +1,7 @@ /**************************************************************************** * NxWidgets/nxwm/include/cnxtaskbar.hxx * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -89,7 +89,7 @@ namespace NxWM /** * This structure represents an application and its associated icon image */ - + struct STaskbarSlot { IApplication *app; /**< A reference to the icon */ @@ -108,7 +108,7 @@ namespace NxWM bool m_started; /**< True if window manager has been started */ /** - * Create a raw window. + * Create a raw window. * * 1) Create a dumb NXWidgets::CWidgetControl instance (See not). * 2) Pass the dumb NXWidgets::CWindowMessenger instance to the window constructor @@ -134,7 +134,7 @@ namespace NxWM * * @return A partially initialized application window instance. */ - + NXWidgets::CNxTkWindow *openFramedWindow(void); /** @@ -155,7 +155,7 @@ namespace NxWM virtual bool createTaskbarWindow(void); /** - * Create the background window. + * Create the background window. * * @return true on success */ @@ -163,7 +163,7 @@ namespace NxWM virtual bool createBackgroundWindow(void); /** - * Create the background image. + * Create the background image. * * @return true on success */ @@ -247,7 +247,7 @@ namespace NxWM /** * Connect to the server */ - + bool connect(void); /** @@ -409,7 +409,15 @@ namespace NxWM */ void getDisplaySize(FAR struct nxgl_size_s &size); - + + /** + * Force a redraw of the taskbar and current application. + * This should only be necessary if the display loses state due to e.g. powerdown + * or other manual intervention. + */ + + inline void redraw() { redrawTopApplication(); } + /** * Simulate a mouse click or release on the icon at index. This method * is only available during automated testing of NxWM. -- cgit v1.2.3