X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Farea.h;h=da437aa7118c6cea0da3e7c6aa9d47c4e2f303bf;hb=87acd48b92031b378887ea8b7ea9fa54aea8fa25;hp=fc294f3ea7fdd69358f2a12d32da8637b7f536cf;hpb=bab0811f845cedb817a3c3a29dd91ade07d5a886;p=chaz%2Ftint2

diff --git a/src/util/area.h b/src/util/area.h
index fc294f3..da437aa 100644
--- a/src/util/area.h
+++ b/src/util/area.h
@@ -47,6 +47,10 @@ typedef struct
 } Background;
 
 
+// way to calculate the size
+// SIZE_BY_LAYOUT objects : taskbar and task
+// SIZE_BY_CONTENT objects : clock, battery, launcher, systray
+enum { SIZE_BY_LAYOUT, SIZE_BY_CONTENT };
 
 typedef struct {
 	// coordinate relative to panel window
@@ -59,8 +63,12 @@ typedef struct {
 	// list of child : Area object
 	GSList *list;
 
+	// object visible on screen. 
+	// An object (like systray) could be enabled but hidden (because no tray icon).
 	int on_screen;
-	// need compute position and width
+	// way to calculate the size (SIZE_BY_CONTENT or SIZE_BY_LAYOUT)
+	int size_mode;
+	// need to calculate position and width
 	int resize;
 	// need redraw Pixmap
 	int redraw;
@@ -74,22 +82,34 @@ typedef struct {
 
 	// each object can overwrite following function
 	void (*_draw_foreground)(void *obj, cairo_t *c);
-	void (*_resize)(void *obj);
-	void (*_add_child)(void *obj);
-	int (*_remove_child)(void *obj);
+	// update area's content and update size (width/heith). 
+	// return '1' if size changed, '0' otherwise.
+	int (*_resize)(void *obj);
+	// after pos/size changed, the rendering engine will call _on_change_layout(Area*)
+	int on_changed;
+	void (*_on_change_layout)(void *obj);
 	const char* (*_get_tooltip_text)(void *obj);
 } Area;
 
+// on startup, initialize fixed pos/size
+void init_rendering(void *obj, int pos);
 
-
+void rendering(void *obj);
+void size_by_content (Area *a);
+void size_by_layout (Area *a, int pos, int level);
 // draw background and foreground
 void refresh (Area *a);
-
-void size (Area *a);
+ 
+// generic resize for SIZE_BY_LAYOUT objects
+int resize_by_layout(void *obj, int maximum_size);
 
 // set 'redraw' on an area and childs
 void set_redraw (Area *a);
 
+// hide/unhide area
+void hide(Area *a);
+void show(Area *a);
+
 // draw pixmap
 void draw (Area *a);
 void draw_background (Area *a, cairo_t *c);