aboutsummaryrefslogtreecommitdiffstats
path: root/src/iconbar.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/iconbar.h')
-rw-r--r--src/iconbar.h104
1 files changed, 26 insertions, 78 deletions
diff --git a/src/iconbar.h b/src/iconbar.h
index f5482d3d0..eb66e9afc 100644
--- a/src/iconbar.h
+++ b/src/iconbar.h
@@ -6,11 +6,7 @@
#include "exec.h"
#include "view.h"
-#define SCROLL_W 16
-#define SCREEN_W 1280
-
-typedef struct _iconbar_icon E_Iconbar_Icon;
-
+typedef struct _E_Iconbar_Icon E_Iconbar_Icon;
#ifndef E_ICONBAR_TYPEDEF
#define E_ICONBAR_TYPEDEF
typedef struct _E_Iconbar E_Iconbar;
@@ -21,86 +17,38 @@ typedef struct _E_Iconbar E_Iconbar;
typedef struct _E_View E_View;
#endif
-
-struct _iconbar_icon
+struct _E_Iconbar
{
- OBJ_PROPERTIES;
-
- Evas_Object image;
- char *exec;
- int w, h;
- double x, y;
+ OBJ_PROPERTIES;
+
+ E_View *view;
+ Evas_List icons;
- int selected;
+ Ebits_Object *bit;
+ struct {
+ double x, y, w, h;
+ } icon_area;
};
-struct _E_Iconbar
+struct _E_Iconbar_Icon
{
- OBJ_PROPERTIES;
-
- char *name;
- E_View *v;
- Evas e;
- Evas_List icons;
- char *db;
-
- struct {
- Evas_Object clip;
- Evas_Object scroll;
- Evas_Object line_l;
- Evas_Object line_c;
- Evas_Object line_r;
- Evas_Object title;
- } obj;
-
- struct {
- char *title;
- char *vline;
- char *hline;
- } image;
-
-
- double start, speed, length;
-
- int scrolling, scroll_when_less;
-
- struct {
- int w;
- int h;
- int top;
- int left;
- int scroll_w;
- int title_w, title_h, line_w, line_h;
-
- int horizontal; /* 1 - horiz, 0 - vert */
-
- struct {
- int top;
- int left;
- int h;
- int w;
- } conf;
- } geom;
+ OBJ_PROPERTIES;
+
+ E_Iconbar *iconbar;
+
+ Evas_Object image;
+
+ char *image_path;
+ char *exec;
+
+ int selected;
};
-
void e_iconbar_init(void);
-E_Iconbar *e_iconbar_new(E_View *);
-int e_iconbar_config(E_Iconbar *);
-void e_iconbar_realize(E_Iconbar *);
-void e_iconbar_redraw(E_Iconbar *);
-E_Iconbar_Icon *e_iconbar_new_icon(E_Iconbar *, char *, char *);
-void e_iconbar_fix_icons(E_Iconbar *);
-void e_iconbar_create_icons_from_db(E_Iconbar *);
-void e_iconbar_free(E_Iconbar *);
-void e_iconbar_update(E_Iconbar *);
-
-void i_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void i_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void i_mouse_down(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-
-void s_mouse_move(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void s_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void s_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
+E_Iconbar *e_iconbar_new(E_View *v);
+void e_iconbar_free(E_Iconbar *ib);
+void e_iconbar_icon_free(E_Iconbar_Icon *);
+void e_iconbar_realize(E_Iconbar *ib);
+void e_iconbar_fix(E_Iconbar *ib);
#endif