From: ChunEon Park Date: Tue, 31 Aug 2010 06:20:38 +0000 (+0900) Subject: [changelog] repackaging. X-Git-Tag: origin~309 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0685e625b5aba0de9d503a567ab4532f4c484601;p=framework%2Fuifw%2Felementary.git [changelog] repackaging. [elm_ctxpopup] updated for indicator --- diff --git a/debian/changelog b/debian/changelog index 464e732..eb9e9e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +elementary (0.4.0+svn.49550slp2+3build46) unstable; urgency=low + + * repackaging. please refer git log. + * Git: 165.213.180.234:/git/slp/pkgs/elementary + * Tag: elementary_0.4.0+svn.49550slp2+3build46 + + -- ChunEon Park Tue, 31 Aug 2010 15:17:11 +0900 + elementary (0.4.0+svn.49550slp2+3build45) unstable; urgency=low * repackage for slidingdrawer diff --git a/src/lib/elm_ctxpopup.c b/src/lib/elm_ctxpopup.c index 6a800bb..9f91ee0 100644 --- a/src/lib/elm_ctxpopup.c +++ b/src/lib/elm_ctxpopup.c @@ -243,18 +243,31 @@ _item_sizing_eval(Elm_Ctxpopup_Item *item) static int _get_indicator_h(Evas_Object *parent) { - int h = 0; - Ecore_X_Window zone, xwin; + Ecore_X_Window zone, xwin, root; + int w = 0, h = 0; + int rotation = -1; + int count; + unsigned char *prop_data = NULL; + int ret; + + root = ecore_x_window_root_get(ecore_x_window_focus_get()); + ret = ecore_x_window_prop_property_get(root, ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE, + ECORE_X_ATOM_CARDINAL, 32, &prop_data, &count); + if (ret && prop_data) memcpy(&rotation, prop_data, sizeof(int)); + if (prop_data) free(prop_data); xwin = elm_win_xwindow_get(parent); zone = ecore_x_e_illume_zone_get(xwin); - ecore_x_e_illume_indicator_geometry_get(zone, NULL, NULL, NULL, &h); -// fprintf( stderr, "indicator h = %d\n", h); + ecore_x_e_illume_indicator_geometry_get(zone, NULL, NULL, &w, &h); - if (h < 0) - h = 0; + if(w< 0) w = 0; + if (h < 0) h = 0; - return h; + if( (rotation == 0) || (rotation ==180)) { + return h; + }else { + return w; + } } static Elm_Ctxpopup_Arrow