Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/x11
Modified Files:
ewl_engine_x11.c
Log Message:
stop confusing e17
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/x11/ewl_engine_x11.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- ewl_engine_x11.c 14 Jul 2008 17:54:29 -0000 1.61
+++ ewl_engine_x11.c 25 Jul 2008 08:59:23 -0000 1.62
@@ -470,20 +470,29 @@
static void
ee_window_min_max_size_set(Ewl_Window *win)
{
+ int min_w, min_h, max_w, max_h;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(win);
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
+ min_w = ewl_object_minimum_w_get(EWL_OBJECT(win));
+ min_h = ewl_object_minimum_h_get(EWL_OBJECT(win));
+ max_w = ewl_object_maximum_w_get(EWL_OBJECT(win));
+ max_h = ewl_object_maximum_h_get(EWL_OBJECT(win));
+
+ if (min_w > max_w)
+ min_w = max_w;
+ if (min_h > max_h)
+ min_h = max_h;
+
ecore_x_icccm_size_pos_hints_set(INTPTR_TO_INT(win->window),
0, ECORE_X_GRAVITY_NW,
-
ewl_object_minimum_w_get(EWL_OBJECT(win)),
-
ewl_object_minimum_h_get(EWL_OBJECT(win)),
-
ewl_object_maximum_w_get(EWL_OBJECT(win)),
-
ewl_object_maximum_h_get(EWL_OBJECT(win)),
+ min_w, min_h,
+ max_w, max_h,
0, 0, /* base */
0, 0, /* step */
0, 0); /* aspect */
-
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1091,8 +1100,7 @@
* (As long as it doesn't break initial size.)
*/
if (ev->from_wm) window->flags |= EWL_WINDOW_USER_CONFIGURE;
- ewl_object_geometry_request(EWL_OBJECT(window), 0, 0, ev->w,
- ev->h);
+ ewl_object_size_request(EWL_OBJECT(window), ev->w, ev->h);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
