diff options
Diffstat (limited to 'NxWidgets')
| -rwxr-xr-x | NxWidgets/ChangeLog.txt | 3 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/include/cnxwidget.hxx | 72 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx | 16 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx | 12 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cnxwidget.cxx | 249 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx | 34 | ||||
| -rw-r--r-- | NxWidgets/nxwm/include/nxwmconfig.hxx | 6 |
7 files changed, 20 insertions, 372 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 000fe2cda..570942828 100755 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -22,3 +22,6 @@ need to "rewind" to the beginning of the image. * CRlePalettBitmap: Fixe a positioning problem. It was actually losing the last row of every image! +* CNxWidget: Removed support for "shelving" widgets. I will be removing + some lesser used feature over time in order to reduce the NxWidgets + footprint. diff --git a/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/NxWidgets/libnxwidgets/include/cnxwidget.hxx index f46c2e73a..99e748f38 100644 --- a/NxWidgets/libnxwidgets/include/cnxwidget.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwidget.hxx @@ -131,8 +131,7 @@ namespace NXWidgets enum CloseType { CLOSE_TYPE_CLOSE = 0, /**< Widgets should call the close() method */ - CLOSE_TYPE_HIDE = 1, /**< Widgets should call the hide() method */ - CLOSE_TYPE_SHELVE = 2 /**< Widgets should call the shelve() method */ + CLOSE_TYPE_HIDE = 1 /**< Widgets should call the hide() method */ }; /** @@ -158,7 +157,6 @@ namespace NXWidgets uint8_t hasFocus : 1; /**< True if the widget has focus. */ uint8_t dragging : 1; /**< True if the widget is being dragged. */ uint8_t deleted : 1; /**< True if the widget has been deleted. */ - uint8_t shelved : 1; /**< True if the widget has been shelved. */ uint8_t borderless : 1; /**< True if the widget is borderless. */ uint8_t draggable : 1; /**< True if the widget can be dragged. */ uint8_t drawingEnabled : 1; /**< True if the widget can be drawn. */ @@ -219,7 +217,6 @@ namespace NXWidgets CNxWidget *m_parent; /**< Pointer to the widget's parent. */ CNxWidget *m_focusedChild; /**< Pointer to the child widget that has focus. */ TNxArray<CNxWidget*> m_children; /**< List of child widgets. */ - TNxArray<CNxWidget*> m_shelvedWidgets; /**< List of shelved child widgets. */ // Visible regions @@ -282,16 +279,6 @@ namespace NXWidgets void closeChild(CNxWidget *widget); /** - * Erase the supplied child widget and move it out of the main child - * list into the shelved list. The widget remains in memory and can - * be restored by calling "unshelve()" on the widget. - * - * @param widget The widget to hide. - */ - - void shelveChild(CNxWidget *widget); - - /** * Redraws all regions of child widgets that fall within the invalidRects * regions. * @@ -655,17 +642,6 @@ namespace NXWidgets } /** - * Is the widget shelved? - * - * @return True if the widget is shelved. - */ - - inline const bool isShelved(void) const - { - return m_flags.shelved; - } - - /** * Is the widget modal? Only true if the Widget singleton is also modal. * * @return True if the widget is modal. @@ -1172,27 +1148,6 @@ namespace NXWidgets void close(void); /** - * Erases the widget, removes it from the main hierarchy and sets it to - * invisible. Widgets hidden in this way will be partioned off from - * other widgets and will no longer be processed. - * - * @return True if the widget was shelved. - * @see unshelve() - */ - - bool shelve(void); - - /** - * Moves the widget back into the hierarchy and redraws it. Widgets shown - * in this way will be unpartioned and will be processed again. - * - * @return True if the widget was unshelved. - * @see shelve() - */ - - bool unshelve(void); - - /** * Draws the widget and makes it visible. * Does not steal focus from other widgets. * @@ -1392,31 +1347,6 @@ namespace NXWidgets void moveChildToDeleteQueue(CNxWidget *widget); /** - * Moves the supplied child widget to the shelved widget list. - * For framework use only. - * - * @param widget A pointer to the child widget. - * @return True if the widget was moved successfully. - * @see moveShelvedToChildList() - * @see hide() - */ - - bool moveChildToShelvedList(CNxWidget *widget); - - /** - * Moves the supplied child widget from the shelved list back - * to the child widget list. - * For framework use only. - * - * @param widget A pointer to the shelved widget. - * @return True if the widget was moved successfully. - * @see moveChildtoShelvedList() - * @see show() - */ - - bool moveShelvedToChildList(CNxWidget *widget); - - /** * Sets the supplied widget as the focused child. The widget must * be a child of this widget. * diff --git a/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx b/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx index 965b29f0f..d9f39ddf9 100644 --- a/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx +++ b/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx @@ -270,22 +270,6 @@ namespace NXWidgets virtual void handleDoubleClickEvent(const CWidgetEventArgs &e) { } /** - * Handle a widget shelve event. - * - * @param e The event data. - */ - - virtual void handleShelveEvent(const CWidgetEventArgs &e) { } - - /** - * Handle a widget unshelve event. - * - * @param e The event data. - */ - - virtual void handleUnshelveEvent(const CWidgetEventArgs &e) { } - - /** * Handle a widget action event. * * @param e The event data. diff --git a/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx b/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx index 45e304554..ae9e17847 100644 --- a/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx +++ b/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx @@ -306,18 +306,6 @@ namespace NXWidgets void raiseShowEvent(void); /** - * Raise a shelve event to the event handler. - */ - - void raiseShelveEvent(void); - - /** - * Raise a unshelve event to the event handler. - */ - - void raiseUnshelveEvent(void); - - /** * Raise an enable event to the event handler. */ diff --git a/NxWidgets/libnxwidgets/src/cnxwidget.cxx b/NxWidgets/libnxwidgets/src/cnxwidget.cxx index de84f1393..8b5d0cb57 100644 --- a/NxWidgets/libnxwidgets/src/cnxwidget.cxx +++ b/NxWidgets/libnxwidgets/src/cnxwidget.cxx @@ -173,7 +173,6 @@ CNxWidget::CNxWidget(CWidgetControl *pWidgetControl, m_flags.drawingEnabled = false; m_flags.enabled = true; m_flags.erased = true; - m_flags.shelved = false; m_flags.visibleRegionCacheInvalid = true; m_flags.hidden = false; m_flags.modal = false; @@ -236,13 +235,6 @@ CNxWidget::~CNxWidget(void) m_children[0]->destroy(); } - // Delete shelved children - - while (m_shelvedWidgets.size() > 0) - { - m_shelvedWidgets[0]->destroy(); - } - // Remove ourselve from the controlled widget list m_widgetControl->removeControlledWidget(this); @@ -346,14 +338,14 @@ const bool CNxWidget::isDrawingEnabled(void) const { if (m_parent->isDrawingEnabled()) { - // Drawing is enabled if the widget is drawable, not deleted, and not shelved + // Drawing is enabled if the widget is drawable and not deleted - return (m_flags.drawingEnabled && (!m_flags.deleted) && (!m_flags.shelved) && (!m_flags.hidden)); + return (m_flags.drawingEnabled && (!m_flags.deleted) && (!m_flags.hidden)); } } else { - return (m_flags.drawingEnabled && (!m_flags.deleted) && (!m_flags.shelved) && (!m_flags.hidden)); + return (m_flags.drawingEnabled && (!m_flags.deleted) && (!m_flags.hidden)); } return false; @@ -373,14 +365,14 @@ const bool CNxWidget::isHidden(void) const { if (!m_parent->isHidden()) { - // Hidden if the widget is deleted, shelved or hidden + // Hidden if the widget is deleted or hidden - return (m_flags.deleted || m_flags.shelved || m_flags.hidden); + return (m_flags.deleted || m_flags.hidden); } } else { - return (m_flags.deleted || m_flags.shelved || m_flags.hidden); + return (m_flags.deleted || m_flags.hidden); } return true; @@ -400,14 +392,14 @@ const bool CNxWidget::isEnabled() const { if (m_parent->isEnabled()) { - // Enabled if the widget is enabled, not deleted, not shelved and not hidden + // Enabled if the widget is enabled, not deleted and not hidden - return (m_flags.enabled && (!m_flags.deleted) && (!m_flags.shelved) && (!m_flags.hidden)); + return (m_flags.enabled && (!m_flags.deleted) && (!m_flags.hidden)); } } else { - return (m_flags.enabled && (!m_flags.deleted) && (!m_flags.shelved) && (!m_flags.hidden)); + return (m_flags.enabled && (!m_flags.deleted) && (!m_flags.hidden)); } return false; @@ -683,79 +675,6 @@ void CNxWidget::close(void) } /** - * Erases the widget, removes it from the main hierarchy and sets it to - * invisible. Widgets hidden in this way will be partioned off from - * other widgets and will no longer be processed. - * - * @return True if the widget was shelved. - * @see unshelve() - */ - -bool CNxWidget::shelve(void) -{ - if (!m_flags.shelved) - { - m_widgetEventHandlers->raiseShelveEvent(); - m_widgetEventHandlers->disable(); - - m_flags.shelved = true; - m_flags.drawingEnabled = false; - - // Unset clicked widget if necessary - - CNxWidget *clickedWidget = m_widgetControl->getClickedWidget(); - if (clickedWidget == this) - { - release(clickedWidget->getX(), clickedWidget->getY()); - } - - // Ensure the widget isn't running modally - - stopModal(); - erase(); - - if (m_parent != (CNxWidget *)NULL) - { - m_parent->shelveChild(this); - } - return true; - } - - return false; -} - -/** - * Moves the widget back into the hierarchy and redraws it. Widgets shown - * in this way will be unpartioned and will be processed again. - * - * @return True if the widget was unshelved. - * @see shelve() - */ - -bool CNxWidget::unshelve(void) -{ - if (m_flags.shelved) - { - m_widgetEventHandlers->enable(); - m_widgetEventHandlers->raiseUnshelveEvent(); - - m_flags.drawingEnabled = true; - m_flags.shelved = false; - - if (m_parent != (CNxWidget *)NULL) - { - m_parent->moveShelvedToChildList(this); - m_parent->invalidateVisibleRectCache(); - } - - redraw(); - return true; - } - - return false; -} - -/** * Draws the widget and makes it visible. * Does not steal focus from other widgets. * @@ -1496,71 +1415,6 @@ void CNxWidget::moveChildToDeleteQueue(CNxWidget *widget) } /** - * Moves the supplied child widget to the shelved widget list. - * For framework use only. - * - * @param widget A pointer to the child widget. - * @return True if the widget was moved successfully. - * @see moveShelvedToChildList() - * @see hide() - */ - -bool CNxWidget::moveChildToShelvedList(CNxWidget *widget) -{ - // Locate widget in main vector - - for (int i = 0; i < m_children.size(); i++) - { - if (m_children[i] == widget) - { - // Add widget to shelved vector - - m_shelvedWidgets.push_back(widget); - - // Remove widget from main vector - - m_children.erase(i); - return true; - } - } - - return false; -} - -/** - * Moves the supplied child widget from the shelved list back - * to the child widget list. - * For framework use only. - * - * @param widget A pointer to the shelved widget. - * @return True if the widget was moved successfully. - * @see moveChildtoShelvedList() - * @see show() - */ - -bool CNxWidget::moveShelvedToChildList(CNxWidget *widget) -{ - // Locate widget in shelved vector - - for (int i = 0; i < m_shelvedWidgets.size(); i++) - { - if (m_shelvedWidgets[i] == widget) - { - // Add widget to end of main vector - - m_children.push_back(widget); - - // Remove widget from shelved vector - - m_shelvedWidgets.erase(i); - return true; - } - } - - return false; -} - -/** * Sets the supplied widget as the focused child. The widget must * be a child of this widget. * @@ -2037,24 +1891,6 @@ bool CNxWidget::removeChild(CNxWidget *widget) } } - // Try to locate in shelved vector - - for (int i = 0; i < m_shelvedWidgets.size(); i++) - { - if (m_shelvedWidgets[i] == widget) - { - // Divorce child from parent - - m_shelvedWidgets[i]->setParent((CNxWidget *)NULL); - - // Remove widget from shelved vector - - m_shelvedWidgets.erase(i); - widget->disableDrawing(); - return true; - } - } - return false; } @@ -2263,72 +2099,13 @@ void CNxWidget::closeChild(CNxWidget *widget) } /** - * Erase the supplied child widget and move it out of the main child - * list into the shelved list. The widget remains in memory and can - * be restored by calling "unshelve()" on the widget. + * Redraws all regions of child widgets that fall within the invalidRects + * regions. * - * @param widget The widget to hide. + * @param invalidRects List of invalid regions that need to be redrawn. + * @param sender Pointer to the widget that initiated the redraw. */ -void CNxWidget::shelveChild(CNxWidget *widget) -{ - if (widget == NULL) - { - return; - } - - // Ensure widget knows it is being shelved - - widget->shelve(); - - // Do we need to give another widget focus? - - if (m_focusedChild == widget) - { - m_focusedChild = (CNxWidget *)NULL; - m_widgetControl->clearFocusedWidget(this); - - // Try to choose highest widget - - for (int i = m_children.size() - 1; i > -1; i--) - { - if ((m_children[i] != widget) && (!m_children[i]->isHidden())) - { - m_focusedChild = m_children[i]; - } - } - - // Where should the focus go? - - if (m_focusedChild != NULL) - { - // Send focus to the new active widget - - m_focusedChild->focus(); - - // Route keyboard input to the focused widget - - m_widgetControl->setFocusedWidget(this); - } - else - { - // Give focus to this - - setFocusedWidget((CNxWidget *)NULL); - } - } - - moveChildToShelvedList(widget); -} - - /** - * Redraws all regions of child widgets that fall within the invalidRects - * regions. - * - * @param invalidRects List of invalid regions that need to be redrawn. - * @param sender Pointer to the widget that initiated the redraw. - */ - void CNxWidget::redrawDirtyChildren(TNxArray<CRect> *invalidRects, CNxWidget *sender) { for (int i = m_children.size() - 1; i > -1 ; i--) diff --git a/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx b/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx index 48b762d0d..de8a31b4b 100644 --- a/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx +++ b/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx @@ -437,40 +437,6 @@ void CWidgetEventHandlerList::raiseShowEvent(void) } /** - * Raise a shelve event to the event handler. - */ - -void CWidgetEventHandlerList::raiseShelveEvent(void) -{ - if (isEnabled()) - { - CWidgetEventArgs e(m_widget, 0, 0, 0, 0, KEY_CODE_NONE); - - for (int i = 0; i < m_widgetEventHandlers.size(); ++i) - { - m_widgetEventHandlers.at(i)->handleShelveEvent(e); - } - } -} - -/** - * Raise a unshelve event to the event handler. - */ - -void CWidgetEventHandlerList::raiseUnshelveEvent(void) -{ - if (isEnabled()) - { - CWidgetEventArgs e(m_widget, 0, 0, 0, 0, KEY_CODE_NONE); - - for (int i = 0; i < m_widgetEventHandlers.size(); ++i) - { - m_widgetEventHandlers.at(i)->handleUnshelveEvent(e); - } - } -} - -/** * Raise an enable event to the event handler. */ diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index 8ac45fc72..9387e2713 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -138,7 +138,7 @@ #endif #ifndef CONFIG_NXWM_DEFAULT_SHADOWEDGECOLOR -# define CONFIG_NXWM_DEFAULT_SHADOWEDGECOLOR MKRGB(0,0,0) +# define CONFIG_NXWM_DEFAULT_SHADOWEDGECOLOR MKRGB(35,58,73) #endif /** @@ -291,11 +291,11 @@ #endif #ifndef CONFIG_NXWM_NXCONSOLE_WCOLOR -# define CONFIG_NXWM_NXCONSOLE_WCOLOR MKRGB(192,192,192) +# define CONFIG_NXWM_NXCONSOLE_WCOLOR CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR #endif #ifndef CONFIG_NXWM_NXCONSOLE_FONTCOLOR -# define CONFIG_NXWM_NXCONSOLE_FONTCOLOR MKRGB(0,0,0) +# define CONFIG_NXWM_NXCONSOLE_FONTCOLOR CONFIG_NXWM_DEFAULT_FONTCOLOR #endif #ifndef CONFIG_NXWM_NXCONSOLE_FONTID |