X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Farea.c;h=f6e1a1bdefd54ba400de1a27237595d9482e3ddc;hb=c0f91cbbb76989eb2e6a7a2185509573b0c3b0cb;hp=34a4d13211e60e8b918a2805417686f5d5fc3f5d;hpb=616c9da1e11226d2b98478ee644d12339489813a;p=chaz%2Ftint2

diff --git a/src/util/area.c b/src/util/area.c
index 34a4d13..f6e1a1b 100644
--- a/src/util/area.c
+++ b/src/util/area.c
@@ -2,7 +2,7 @@
 *
 * Tint2 : area
 *
-* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -59,7 +59,6 @@
  * 	- if 'size' changed then 'resize = 1' on the parent
  * 2) browse tree SIZE_BY_LAYOUT and POSITION
  *  - resize SIZE_BY_LAYOUT node : parent is resized before children
- * 	- if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT
  *  - calculate position (posx,posy) : parent is calculated before children
  * 	- if 'position' changed then 'redraw = 1'
  * 3) browse tree REDRAW
@@ -97,9 +96,9 @@ void init_rendering(void *obj, int pos)
 void rendering(void *obj)
 {
 	Panel *panel = (Panel*)obj;
-	
+
 	size_by_content(&panel->area);
-	size_by_layout(&panel->area, 0, 0);
+	size_by_layout(&panel->area, 0, 1);
 	
 	refresh(&panel->area);
 }
@@ -116,20 +115,69 @@ void size_by_content (Area *a)
 		size_by_content(l->data);
 	
 	// calculate area's size
+	a->on_changed = 0;
 	if (a->resize && a->size_mode == SIZE_BY_CONTENT) {
 		a->resize = 0;
 
 		if (a->_resize) {
 			if (a->_resize(a)) {
-				// 'size' changed => 'resize = 1' on the parent and redraw object
+				// 'size' changed => 'resize = 1' on the parent
 				((Area*)a->parent)->resize = 1;
+				a->on_changed = 1;
 			}
-			a->redraw = 1;
 		}
 	}
 }
 
 
+// calculate total size of all children including
+// parent's padding
+int children_size(Area *a, int horizontal)
+{
+	int size = 0;
+	GSList *l;
+
+	for (l = a->list; l; l = l->next) {
+		Area *child = ((Area*)l->data);
+		if (!child->on_screen) continue;
+
+		if (horizontal)
+			size += child->width + a->paddingx;
+		else
+			size += child->height + a->paddingy;
+	}
+
+	return size;
+}
+
+
+// calculate chilren's align offset depending on the align type
+int align_offset(Area *a, int align, int horizontal)
+{
+	int size = 0;
+	int child_size = children_size(a, horizontal);
+
+	if (horizontal)
+		size = a->width;
+	else
+		size = a->height;
+
+	switch (align) {
+	case ALIGN_LEFT:
+		return 0;
+
+	case ALIGN_CENTER:
+		return (size - child_size) / 2;
+
+	case ALIGN_RIGHT:
+		return size - child_size;
+
+	default:
+		return 0;
+	}
+}
+
+
 void size_by_layout (Area *a, int pos, int level)
 {
 	// don't resize hiden objects
@@ -142,12 +190,12 @@ void size_by_layout (Area *a, int pos, int level)
 		a->resize = 0;
 
 		if (a->_resize) {
-			if (a->_resize(a)) {
-				// if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT
-				for (l = a->list; l ; l = l->next) {
-					if (((Area*)l->data)->size_mode == SIZE_BY_LAYOUT)
-						((Area*)l->data)->resize = 1;
-				}
+			a->_resize(a);
+			// resize childs with SIZE_BY_LAYOUT
+			for (l = a->list; l ; l = l->next) {
+				Area *child = ((Area*)l->data);
+				if (child->size_mode == SIZE_BY_LAYOUT && child->list)
+					child->resize = 1;
 			}
 		}
 	}
@@ -164,24 +212,36 @@ void size_by_layout (Area *a, int pos, int level)
 			if (pos != child->posx) {
 				// pos changed => redraw
 				child->posx = pos;
-				child->redraw = 1;
+				child->on_changed = 1;
 			}
 		}
 		else {
 			if (pos != child->posy) {
 				// pos changed => redraw
 				child->posy = pos;
-				child->redraw = 1;
+				child->on_changed = 1;
 			}
 		}
-		//printf("level %d, object %d, pos %d\n", level, i, pos);
 		
-		size_by_layout(child, pos, level+1);
+		/*// position of each visible object
+		int k;
+		for (k=0 ; k < level ; k++) printf("  ");
+		printf("tree level %d, object %d, pos %d, %s\n", level, i, pos, (child->size_mode == SIZE_BY_LAYOUT) ? "SIZE_BY_LAYOUT" : "SIZE_BY_CONTENT");*/
+
+		int offset = align_offset(child, panel_config.g_task.align, panel_horizontal);
+		size_by_layout(child, pos + offset, level + 1);
 		
 		if (panel_horizontal)
 			pos += child->width + a->paddingx;
 		else
 			pos += child->height + a->paddingx;
+	}	
+
+	if (a->on_changed) {
+		// pos/size changed
+		a->redraw = 1;
+		if (a->_on_change_layout)
+			a->_on_change_layout (a);
 	}
 }
 
@@ -195,10 +255,9 @@ void refresh (Area *a)
 	if (a->redraw) {
 		a->redraw = 0;
 		// force redraw of child
-		GSList *l;
-		for (l = a->list ; l ; l = l->next)
-			((Area*)l->data)->redraw = 1;
-//			set_redraw(l->data);
+		//GSList *l;
+		//for (l = a->list ; l ; l = l->next)
+			//((Area*)l->data)->redraw = 1;
 
 		//printf("draw area posx %d, width %d\n", a->posx, a->width);
 		draw(a);
@@ -215,12 +274,11 @@ void refresh (Area *a)
 }
 
 
-int resize_by_layout(void *obj)
+int resize_by_layout(void *obj, int maximum_size)
 {
 	Area *child, *a = (Area*)obj;
 	int size, nb_by_content=0, nb_by_layout=0;
 
-	printf("resize_by_layout\n");
 	if (panel_horizontal) {		
 		// detect free size for SIZE_BY_LAYOUT's Area
 		size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
@@ -234,26 +292,32 @@ int resize_by_layout(void *obj)
 			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
 				nb_by_layout++;
 		}
+		//printf("  resize_by_layout Deb %d, %d\n", nb_by_content, nb_by_layout);
 		if (nb_by_content+nb_by_layout)
 			size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
-		//printf("resize_panel : size_panel %d, size_layout %d\n", panel->area.width, size);
 
-		int width=0, modulo=0;
+		int width=0, modulo=0, old_width;
 		if (nb_by_layout) {
 			width = size / nb_by_layout;
 			modulo = size % nb_by_layout;
+			if (width > maximum_size && maximum_size != 0) {
+				width = maximum_size;
+				modulo = 0;
+			}
 		}
 
 		// resize SIZE_BY_LAYOUT objects
 		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+				old_width = child->width;
 				child->width = width;
-				child->resize = 1;
 				if (modulo) {
 					child->width++;
 					modulo--;
 				}
+				if (child->width != old_width)
+					child->on_changed = 1;
 			}
 		}
 	}
@@ -273,22 +337,28 @@ int resize_by_layout(void *obj)
 		if (nb_by_content+nb_by_layout)
 			size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
 
-		int height=0, modulo=0;
+		int height=0, modulo=0, old_height;
 		if (nb_by_layout) {
 			height = size / nb_by_layout;
 			modulo = size % nb_by_layout;
+			if (height > maximum_size && maximum_size != 0) {
+				height = maximum_size;
+				modulo = 0;
+			}
 		}
 
 		// resize SIZE_BY_LAYOUT objects
 		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+				old_height = child->height;
 				child->height = height;
-				child->resize = 1;
 				if (modulo) {
 					child->height++;
 					modulo--;
 				}
+				if (child->height != old_height)
+					child->on_changed = 1;
 			}
 		}
 	}
@@ -424,7 +494,7 @@ void add_area (Area *a)
 {
 	Area *parent = (Area*)a->parent;
 
-	parent->list = g_slist_remove(parent->list, a);
+	parent->list = g_slist_append(parent->list, a);
 	set_redraw (parent);
 
 }