From c74c38760df69bb87e93dff18cf91464e5d02f37 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:00:22 +0200 Subject: Imported Upstream version 0.8.1 --- ColorsPanel.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'ColorsPanel.c') diff --git a/ColorsPanel.c b/ColorsPanel.c index 0086845..cdc0166 100644 --- a/ColorsPanel.c +++ b/ColorsPanel.c @@ -37,32 +37,14 @@ static char* ColorSchemes[] = { NULL }; -ColorsPanel* ColorsPanel_new(Settings* settings, ScreenManager* scr) { - ColorsPanel* this = (ColorsPanel*) malloc(sizeof(ColorsPanel)); - Panel* super = (Panel*) this; - Panel_init(super, 1, 1, 1, 1, CHECKITEM_CLASS, true); - ((Object*)this)->delete = ColorsPanel_delete; - - this->settings = settings; - this->scr = scr; - super->eventHandler = ColorsPanel_EventHandler; - - Panel_setHeader(super, "Colors"); - for (int i = 0; ColorSchemes[i] != NULL; i++) { - Panel_add(super, (Object*) CheckItem_new(String_copy(ColorSchemes[i]), NULL, false)); - } - CheckItem_set((CheckItem*)Panel_get(super, settings->colorScheme), true); - return this; -} - -void ColorsPanel_delete(Object* object) { +static void ColorsPanel_delete(Object* object) { Panel* super = (Panel*) object; ColorsPanel* this = (ColorsPanel*) object; Panel_done(super); free(this); } -HandlerResult ColorsPanel_EventHandler(Panel* super, int ch) { +static HandlerResult ColorsPanel_EventHandler(Panel* super, int ch) { ColorsPanel* this = (ColorsPanel*) super; HandlerResult result = IGNORED; @@ -72,6 +54,7 @@ HandlerResult ColorsPanel_EventHandler(Panel* super, int ch) { case 0x0a: case 0x0d: case KEY_ENTER: + case KEY_MOUSE: case ' ': for (int i = 0; ColorSchemes[i] != NULL; i++) CheckItem_set((CheckItem*)Panel_get(super, i), false); @@ -93,3 +76,20 @@ HandlerResult ColorsPanel_EventHandler(Panel* super, int ch) { return result; } +ColorsPanel* ColorsPanel_new(Settings* settings, ScreenManager* scr) { + ColorsPanel* this = (ColorsPanel*) malloc(sizeof(ColorsPanel)); + Panel* super = (Panel*) this; + Panel_init(super, 1, 1, 1, 1, CHECKITEM_CLASS, true); + ((Object*)this)->delete = ColorsPanel_delete; + + this->settings = settings; + this->scr = scr; + super->eventHandler = ColorsPanel_EventHandler; + + Panel_setHeader(super, "Colors"); + for (int i = 0; ColorSchemes[i] != NULL; i++) { + Panel_add(super, (Object*) CheckItem_new(String_copy(ColorSchemes[i]), NULL, false)); + } + CheckItem_set((CheckItem*)Panel_get(super, settings->colorScheme), true); + return this; +} -- cgit v1.2.3