Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-10-12 16:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apps/graphics/twm4nx: Exploit the new feature to create hidden windows. This cleans up some brief window startup anomalies. Also fixes an initialization error in CMenus.

Browse source
This commit is contained in:
Gregory Nutt 2019-05-07 08:51:37 -06:00
parent b512ec0235
commit b0d39372fb
5 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/graphics/twm4nx/cmenus.hxx
View file

@ -176,7 +176,8 @@ namespace Twm4Nx
}
/**
* Create the menu window
* Create the menu window. Menu windows are always created in the
* hidden state. When the menu is selected, then it should be shown.
*
* @result True is returned on success
*/

7
include/graphics/twm4nx/cwindow.hxx
View file

@ -87,6 +87,7 @@
#define NO_TOOLBAR (NTOOLBAR_BUTTONS + 0)
#define ICONMGR_WINDOW (NTOOLBAR_BUTTONS + 1)
#define HIDDEN_WINDOW (NTOOLBAR_BUTTONS + 2)
#define WFLAGS_NO_MENU_BUTTON (1 << MENU_BUTTON)
#define WFLAGS_NO_DELETE_BUTTON (1 << DELETE_BUTTON)
@ -94,6 +95,7 @@
#define WFLAGS_NO_MINIMIZE_BUTTON (1 << MINIMIZE_BUTTON)
#define WFLAGS_NO_TOOLBAR (1 << NO_TOOLBAR)
#define WFLAGS_IS_ICONMGR (1 << ICONMGR_WINDOW)
#define WFLAGS_HIDDEN_WINDOW (1 << HIDDEN_WINDOW)
#define WFLAGS_HAVE_MENU_BUTTON(f) (((f) & WFLAGS_NO_MENU_BUTTON) == 0)
#define WFLAGS_HAVE_DELETE_BUTTON(f) (((f) & WFLAGS_NO_DELETE_BUTTON) == 0)
@ -101,6 +103,7 @@
#define WFLAGS_HAVE_MINIMIZE_BUTTON(f) (((f) & WFLAGS_NO_MINIMIZE_BUTTON) == 0)
#define WFLAGS_HAVE_TOOLBAR(f) (((f) & WFLAGS_NO_TOOLBAR) == 0)
#define WFLAGS_IS_ICONMGR_WINDOW(f) (((f) & WFLAGS_IS_ICONMGR) != 0)
#define WFLAGS_IS_HIDDEN_WINDOW(f) (((f) & WFLAGS_HIDDEN_WINDOW) != 0)
/////////////////////////////////////////////////////////////////////////////
// Implementation Classes
@ -172,10 +175,12 @@ namespace Twm4Nx
*
* @param winsize The initial window size
* @param winpos The initial window position
* @param flags Toolbar customizations see WFLAGS_NO_* definitions
*/
bool createMainWindow(FAR const nxgl_size_s *winsize,
FAR const nxgl_point_s *winpos);
FAR const nxgl_point_s *winpos,
uint8_t flags);
/**
* Calculate the height of the tool bar