From fa3c7655c2b0f386589ed3ecec2ea4efa87b5d93 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 4 Aug 2017 16:23:39 -0400 Subject: [PATCH] split out gadget enums into separate header --- src/bin/Makefile.mk | 1 + src/bin/e_gadget.h | 26 +------------------------- src/bin/e_gadget_types.h | 30 ++++++++++++++++++++++++++++++ src/bin/meson.build | 1 + 4 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 src/bin/e_gadget_types.h diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 7949c660c..922353bd4 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -115,6 +115,7 @@ src/bin/e_font.h \ src/bin/e_gadcon.h \ src/bin/e_gadcon_popup.h \ src/bin/e_gadget.h \ +src/bin/e_gadget_types.h \ src/bin/e_grabinput.h \ src/bin/e_grab_dialog.h \ src/bin/e.h \ diff --git a/src/bin/e_gadget.h b/src/bin/e_gadget.h index f126b93f4..90252b6b8 100644 --- a/src/bin/e_gadget.h +++ b/src/bin/e_gadget.h @@ -87,31 +87,7 @@ - event_info is the Evas_Object of the popup */ -typedef enum -{ - E_GADGET_SITE_GRAVITY_NONE = 0, - E_GADGET_SITE_GRAVITY_LEFT, - E_GADGET_SITE_GRAVITY_RIGHT, - E_GADGET_SITE_GRAVITY_TOP, - E_GADGET_SITE_GRAVITY_BOTTOM, - E_GADGET_SITE_GRAVITY_CENTER, -} E_Gadget_Site_Gravity; - -typedef enum -{ - E_GADGET_SITE_ORIENT_NONE = 0, - E_GADGET_SITE_ORIENT_HORIZONTAL, - E_GADGET_SITE_ORIENT_VERTICAL, -} E_Gadget_Site_Orient; - -typedef enum -{ - E_GADGET_SITE_ANCHOR_NONE = 0, - E_GADGET_SITE_ANCHOR_LEFT = (1 << 0), - E_GADGET_SITE_ANCHOR_RIGHT = (1 << 1), - E_GADGET_SITE_ANCHOR_TOP = (1 << 2), - E_GADGET_SITE_ANCHOR_BOTTOM = (1 << 3), -} E_Gadget_Site_Anchor; +#include "e_gadget_types.h" typedef Evas_Object *(*E_Gadget_Create_Cb)(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient); typedef Evas_Object *(*E_Gadget_Configure_Cb)(Evas_Object *gadget); diff --git a/src/bin/e_gadget_types.h b/src/bin/e_gadget_types.h new file mode 100644 index 000000000..070592e1e --- /dev/null +++ b/src/bin/e_gadget_types.h @@ -0,0 +1,30 @@ +#ifndef E_GADGET_TYPES_H +# define E_GADGET_TYPES_H + +typedef enum +{ + E_GADGET_SITE_GRAVITY_NONE = 0, + E_GADGET_SITE_GRAVITY_LEFT, + E_GADGET_SITE_GRAVITY_RIGHT, + E_GADGET_SITE_GRAVITY_TOP, + E_GADGET_SITE_GRAVITY_BOTTOM, + E_GADGET_SITE_GRAVITY_CENTER, +} E_Gadget_Site_Gravity; + +typedef enum +{ + E_GADGET_SITE_ORIENT_NONE = 0, + E_GADGET_SITE_ORIENT_HORIZONTAL, + E_GADGET_SITE_ORIENT_VERTICAL, +} E_Gadget_Site_Orient; + +typedef enum +{ + E_GADGET_SITE_ANCHOR_NONE = 0, + E_GADGET_SITE_ANCHOR_LEFT = (1 << 0), + E_GADGET_SITE_ANCHOR_RIGHT = (1 << 1), + E_GADGET_SITE_ANCHOR_TOP = (1 << 2), + E_GADGET_SITE_ANCHOR_BOTTOM = (1 << 3), +} E_Gadget_Site_Anchor; + +#endif diff --git a/src/bin/meson.build b/src/bin/meson.build index 7ba73a14c..de45260e3 100644 --- a/src/bin/meson.build +++ b/src/bin/meson.build @@ -283,6 +283,7 @@ headers_e = [ 'e_gadcon.h', 'e_gadcon_popup.h', 'e_gadget.h', + 'e_gadget_types.h', 'e_grabinput.h', 'e_grab_dialog.h', 'e.h',