ComboGroup now properly reacts on the 'ESC' key pressure and hides the dropdown list.

Author: sadko4u

CHANGELOG

@@ -11,7 +11,7 @@
 * Added process_pending_events() in the tk::Display class for handling pending
   events at the main loop start and at the main loop end.
 * Changed behaviour of the AudioSample widget related to displaying load status.
-* ComboBox now properly reacts on the 'ESC' key pressure and hides the dropdown list.
+* ComboBox and ComboGroup now properly react on the 'ESC' key pressure and hides the dropdown list.
 * Updated build scripts.
 
 === 1.0.33 ===

include/lsp-plug.in/tk/widgets/compound/ComboGroup.h

@@ -150,10 +150,15 @@ namespace lsp
                 ListBoxItem                *current_item();
                 bool                        scroll_item(ssize_t direction, size_t count);
 
+            protected:
                 static void                 on_add_widget(void *obj, Property *prop, void *w);
                 static void                 on_remove_widget(void *obj, Property *prop, void *w);
+
+            protected:
                 static status_t             slot_on_change(Widget *sender, void *ptr, void *data);
                 static status_t             slot_on_submit(Widget *sender, void *ptr, void *data);
+                static status_t             slot_on_cancel(Widget *sender, void *ptr, void *data);
+                static status_t             slot_on_listbox_cancel(Widget *sender, void *ptr, void *data);
 
             protected:
                 virtual Widget             *find_widget(ssize_t x, ssize_t y) override;
@@ -218,6 +223,7 @@ namespace lsp
 
                 virtual status_t            on_change();
                 virtual status_t            on_submit();
+                virtual status_t            on_cancel();
 
         };
 

src/main/widgets/compound/ComboGroup.cpp

@@ -234,6 +234,12 @@ namespace lsp
             handler_id_t id;
             id = sSlots.add(SLOT_CHANGE, slot_on_change, self());
             if (id >= 0) id = sSlots.add(SLOT_SUBMIT, slot_on_change, self());
+            if (id >= 0) id = sSlots.add(SLOT_CANCEL, slot_on_cancel, self());
+            if (id < 0)
+                return -id;
+
+            // Bind ListBox slots
+            id = sLBox.slots()->bind(SLOT_CANCEL, slot_on_listbox_cancel, self());
             if (id < 0)
                 return -id;
 
@@ -669,14 +675,27 @@ namespace lsp
 
         status_t ComboGroup::slot_on_change(Widget *sender, void *ptr, void *data)
         {
-            ComboGroup *_this = widget_ptrcast<ComboGroup>(ptr);
-            return (_this != NULL) ? _this->on_change() : STATUS_BAD_ARGUMENTS;
+            ComboGroup *const self = widget_ptrcast<ComboGroup>(ptr);
+            return (self != NULL) ? self->on_change() : STATUS_BAD_ARGUMENTS;
         }
 
         status_t ComboGroup::slot_on_submit(Widget *sender, void *ptr, void *data)
         {
-            ComboGroup *_this = widget_ptrcast<ComboGroup>(ptr);
-            return (_this != NULL) ? _this->on_submit() : STATUS_BAD_ARGUMENTS;
+            ComboGroup *const self = widget_ptrcast<ComboGroup>(ptr);
+            return (self != NULL) ? self->on_submit() : STATUS_BAD_ARGUMENTS;
+        }
+
+        status_t ComboGroup::slot_on_cancel(Widget *sender, void *ptr, void *data)
+        {
+            ComboGroup *const self = widget_ptrcast<ComboGroup>(ptr);
+            return (self != NULL) ? self->on_cancel() : STATUS_BAD_ARGUMENTS;
+        }
+
+        status_t ComboGroup::slot_on_listbox_cancel(Widget *sender, void *ptr, void *data)
+        {
+            ComboGroup * const self = widget_ptrcast<ComboGroup>(ptr);
+            self->sOpened.set(false);
+            return self->sSlots.execute(SLOT_CANCEL, self, NULL);
         }
 
         status_t ComboGroup::on_change()
@@ -689,6 +708,11 @@ namespace lsp
             return STATUS_OK;
         }
 
+        status_t ComboGroup::on_cancel()
+        {
+            return STATUS_OK;
+        }
+
         status_t ComboGroup::on_mouse_down(const ws::event_t *e)
         {
             if (nMBState == 0)