Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: fix up resize edje to be less offensive :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -3 -r1.87 -r1.88 --- e_border.c 7 Feb 2005 13:51:08 -0000 1.87 +++ e_border.c 7 Feb 2005 14:19:30 -0000 1.88 @@ -2153,6 +2153,8 @@ if (bd->client.icccm.max_h > 32767) bd->client.icccm.max_h = 32767; if (bd->client.icccm.base_w > 32767) bd->client.icccm.base_w = 32767; if (bd->client.icccm.base_h > 32767) bd->client.icccm.base_h = 32767; + if (bd->client.icccm.step_w < 1) bd->client.icccm.step_w = 1; + if (bd->client.icccm.step_h < 1) bd->client.icccm.step_h = 1; printf("##- SIZE HINTS for 0x%x: min %ix%i, max %ix%i, base %ix%i\n", bd->client.win, bd->client.icccm.min_w, bd->client.icccm.min_h, @@ -3156,7 +3158,7 @@ resize_obj = edje_object_add(ecore_evas_get(resize_ee)); edje_object_file_set(resize_obj, e_path_find(path_themes, "default.eet"), "widgets/border/default/resize"); - snprintf(buf, sizeof(buf) - 1, "%dx%d", bd->w, bd->h); + snprintf(buf, sizeof(buf), "9999x9999"); edje_object_part_text_set(resize_obj, "text", buf); edje_object_size_min_calc(resize_obj, &w, &h); @@ -3164,6 +3166,11 @@ evas_object_resize(resize_obj, w, h); evas_object_show(resize_obj); + snprintf(buf, sizeof(buf), "%ix%i", + (bd->client.w - bd->client.icccm.base_w) / bd->client.icccm.step_w, + (bd->client.h - bd->client.icccm.base_h) / bd->client.icccm.step_h); + edje_object_part_text_set(resize_obj, "text", buf); + ecore_evas_move(resize_ee, (bd->zone->w - w) / 2, (bd->zone->h - h) / 2); ecore_evas_resize(resize_ee, w, h); @@ -3182,6 +3189,8 @@ { char buf[40]; - snprintf(buf, sizeof(buf) - 1, "%dx%d", bd->w, bd->h); + snprintf(buf, sizeof(buf) - 1, "%ix%i", + (bd->client.w - bd->client.icccm.base_w) / bd->client.icccm.step_w, + (bd->client.h - bd->client.icccm.base_h) / bd->client.icccm.step_h); edje_object_part_text_set(resize_obj, "text", buf); } ------------------------------------------------------- This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag-&-drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs