diff --git a/graphics/twm4nx/README.txt b/graphics/twm4nx/README.txt index 6d4987325..126ffef9e 100644 --- a/graphics/twm4nx/README.txt +++ b/graphics/twm4nx/README.txt @@ -89,12 +89,12 @@ Issues: with the window drag movement. it is hard to tell because of limitations in the touchscreen performance on the system that I am working with. - 7. Icom drag movement includes logic to avoid collisions with other + 7. Icon drag movement includes logic to avoid collisions with other icons and with the background image. That later is an issue. The background image image widget needs to be removed; it can occlude a dektop icon. We need to paint the image directly on the background without the use of a widget. - 8. More issues with the background image: I absords touchscreen + 8. More issues with the background image: It absorbs touchscreen presses without doing anything. It should bring-up the main menu menu just as any other region of the background. This would be easy to fix, but just replacing the background image widget is the better diff --git a/graphics/twm4nx/src/ciconmgr.cxx b/graphics/twm4nx/src/ciconmgr.cxx index 546a63b50..d86710820 100644 --- a/graphics/twm4nx/src/ciconmgr.cxx +++ b/graphics/twm4nx/src/ciconmgr.cxx @@ -69,7 +69,7 @@ #include "graphics/twm4nx/cwindowevent.hxx" #include "graphics/twm4nx/cwindowfactory.hxx" #include "graphics/twm4nx/ctwm4nxevent.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" #include "graphics/twm4nx/ciconmgr.hxx" ///////////////////////////////////////////////////////////////////////////// diff --git a/graphics/twm4nx/src/ciconwidget.cxx b/graphics/twm4nx/src/ciconwidget.cxx index 7d497c814..171566b8f 100644 --- a/graphics/twm4nx/src/ciconwidget.cxx +++ b/graphics/twm4nx/src/ciconwidget.cxx @@ -60,7 +60,7 @@ #include "graphics/twm4nx/cwindowfactory.hxx" #include "graphics/twm4nx/cbackground.hxx" #include "graphics/twm4nx/ciconwidget.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" #include "graphics/twm4nx/twm4nx_cursor.hxx" ///////////////////////////////////////////////////////////////////////////// diff --git a/graphics/twm4nx/src/cmainmenu.cxx b/graphics/twm4nx/src/cmainmenu.cxx index fef9addb6..c4b34641a 100644 --- a/graphics/twm4nx/src/cmainmenu.cxx +++ b/graphics/twm4nx/src/cmainmenu.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include ///////////////////////////////////////////////////////////////////////////// // Implementation Class Definition diff --git a/graphics/twm4nx/src/cmenus.cxx b/graphics/twm4nx/src/cmenus.cxx index fe590ad5d..225cfb527 100644 --- a/graphics/twm4nx/src/cmenus.cxx +++ b/graphics/twm4nx/src/cmenus.cxx @@ -71,7 +71,7 @@ #include "graphics/twm4nx/cwindowfactory.hxx" #include "graphics/twm4nx/cwindowevent.hxx" #include "graphics/twm4nx/ctwm4nxevent.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" #include "graphics/twm4nx/cmenus.hxx" //////////////////////////////////////////////////////////////////////////// diff --git a/graphics/twm4nx/src/cresize.cxx b/graphics/twm4nx/src/cresize.cxx index d5367b38f..1b0143516 100644 --- a/graphics/twm4nx/src/cresize.cxx +++ b/graphics/twm4nx/src/cresize.cxx @@ -59,7 +59,7 @@ #include "graphics/twm4nx/cfonts.hxx" #include "graphics/twm4nx/cwindow.hxx" #include "graphics/twm4nx/ctwm4nxevent.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" #include "graphics/twm4nx/cresize.hxx" ///////////////////////////////////////////////////////////////////////////// diff --git a/graphics/twm4nx/src/ctwm4nx.cxx b/graphics/twm4nx/src/ctwm4nx.cxx index 09a2297d2..844be1b7f 100644 --- a/graphics/twm4nx/src/ctwm4nx.cxx +++ b/graphics/twm4nx/src/ctwm4nx.cxx @@ -80,7 +80,7 @@ #include "graphics/twm4nx/cmainmenu.hxx" #include "graphics/twm4nx/cresize.hxx" #include "graphics/twm4nx/cfonts.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" // Applications diff --git a/graphics/twm4nx/src/cwindow.cxx b/graphics/twm4nx/src/cwindow.cxx index a35a4cf54..92da6355d 100644 --- a/graphics/twm4nx/src/cwindow.cxx +++ b/graphics/twm4nx/src/cwindow.cxx @@ -78,7 +78,7 @@ #include "graphics/twm4nx/cwindow.hxx" #include "graphics/twm4nx/cwindowfactory.hxx" #include "graphics/twm4nx/ctwm4nxevent.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" #include "graphics/twm4nx/twm4nx_cursor.hxx" ///////////////////////////////////////////////////////////////////////////// diff --git a/graphics/twm4nx/src/cwindowfactory.cxx b/graphics/twm4nx/src/cwindowfactory.cxx index efa8f4007..fb3711419 100644 --- a/graphics/twm4nx/src/cwindowfactory.cxx +++ b/graphics/twm4nx/src/cwindowfactory.cxx @@ -64,7 +64,7 @@ #include "graphics/twm4nx/cwindowfactory.hxx" #include "graphics/twm4nx/ciconmgr.hxx" #include "graphics/twm4nx/cmainmenu.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" ///////////////////////////////////////////////////////////////////////////// // CWindowFactory Implementation diff --git a/include/graphics/twm4nx/ciconmgr.hxx b/include/graphics/twm4nx/ciconmgr.hxx index 2d49ffee7..fbb2d93ac 100644 --- a/include/graphics/twm4nx/ciconmgr.hxx +++ b/include/graphics/twm4nx/ciconmgr.hxx @@ -54,7 +54,7 @@ #include "graphics/twm4nx/cwindow.hxx" #include "graphics/twm4nx/cmainmenu.hxx" #include "graphics/twm4nx/iapplication.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" ///////////////////////////////////////////////////////////////////////////// // Implementation Classes @@ -76,8 +76,8 @@ namespace Twm4Nx FAR struct SWindowEntry *flink; /**< Forward link to next window entry */ FAR struct SWindowEntry *blink; /**< Backward link to previous window entry */ FAR CWindow *cwin; /**< The window payload */ - int row; /**< X position in the button array */ - int column; + int row; /**< Y position in the button array */ + int column; /**< X position in the button array */ }; class CIconMgr : protected NXWidgets::CWidgetEventHandler, diff --git a/include/graphics/twm4nx/cnxterm.hxx b/include/graphics/twm4nx/cnxterm.hxx index 27b606b5f..cc1ca4139 100644 --- a/include/graphics/twm4nx/cnxterm.hxx +++ b/include/graphics/twm4nx/cnxterm.hxx @@ -49,7 +49,7 @@ #include "graphics/twm4nx/ctwm4nx.hxx" #include "graphics/twm4nx/ctwm4nxevent.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" #include "graphics/twm4nx/iapplication.hxx" ///////////////////////////////////////////////////////////////////////////// diff --git a/include/graphics/twm4nx/ctwm4nx.hxx b/include/graphics/twm4nx/ctwm4nx.hxx index 6e05a7a8b..6094cb090 100644 --- a/include/graphics/twm4nx/ctwm4nx.hxx +++ b/include/graphics/twm4nx/ctwm4nx.hxx @@ -64,7 +64,7 @@ #include "graphics/nxwidgets/cimage.hxx" #include "graphics/twm4nx/cwindowevent.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" ///////////////////////////////////////////////////////////////////////////// // Pre-processor Definitions diff --git a/include/graphics/twm4nx/cwindowevent.hxx b/include/graphics/twm4nx/cwindowevent.hxx index 555d6d531..129564998 100644 --- a/include/graphics/twm4nx/cwindowevent.hxx +++ b/include/graphics/twm4nx/cwindowevent.hxx @@ -50,7 +50,7 @@ #include "graphics/nxwidgets/cwindoweventhandler.hxx" #include "graphics/nxwidgets/cwidgetstyle.hxx" #include "graphics/nxwidgets/cwidgetcontrol.hxx" -#include "graphics/twm4nx/twm4nx_widgetevents.hxx" +#include "graphics/twm4nx/twm4nx_events.hxx" #include "graphics/twm4nx/ctwm4nx.hxx" ///////////////////////////////////////////////////////////////////////////// diff --git a/include/graphics/twm4nx/twm4nx_widgetevents.hxx b/include/graphics/twm4nx/twm4nx_events.hxx similarity index 97% rename from include/graphics/twm4nx/twm4nx_widgetevents.hxx rename to include/graphics/twm4nx/twm4nx_events.hxx index 5fa073baf..cb5dd3cf0 100644 --- a/include/graphics/twm4nx/twm4nx_widgetevents.hxx +++ b/include/graphics/twm4nx/twm4nx_events.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/twm4nx/include/twm4nx_widgetevents.hxx +// apps/graphics/twm4nx/include/twm4nx_events.hxx // Twm4Nx Widget Event Handling // // Copyright (C) 2019 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ // ///////////////////////////////////////////////////////////////////////////// -#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_WIDGETEVENTS_HXX -#define __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_WIDGETEVENTS_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_EVENTS_HXX +#define __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_EVENTS_HXX ///////////////////////////////////////////////////////////////////////////// // Included Files @@ -250,4 +250,4 @@ namespace Twm4Nx }; } -#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_WIDGETEVENTS_HXX +#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_EVENTS_HXX