forked from enlightenment/efl
Elementary: conform only use X stuff if we are on X
Fix issues with shot. SVN revision: 61589
This commit is contained in:
parent
9261f2d761
commit
6330bbe01e
|
@ -196,13 +196,14 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type)
|
||||||
Evas_Object *top = elm_widget_top_get(obj);
|
Evas_Object *top = elm_widget_top_get(obj);
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
xwin = elm_win_xwindow_get(top);
|
xwin = elm_win_xwindow_get(top);
|
||||||
zone = ecore_x_e_illume_zone_get(xwin);
|
if (xwin)
|
||||||
|
zone = ecore_x_e_illume_zone_get(xwin);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (part_type & ELM_CONFORM_INDICATOR_PART)
|
if (part_type & ELM_CONFORM_INDICATOR_PART)
|
||||||
{
|
{
|
||||||
if (!_conformant_part_geometry_env_get("ILLUME_IND",
|
if ((!_conformant_part_geometry_env_get("ILLUME_IND",
|
||||||
&sx, &sy, &sw, &sh)) {
|
&sx, &sy, &sw, &sh)) && (xwin)) {
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
ecore_x_e_illume_indicator_geometry_get(zone, &sx, &sy, &sw, &sh);
|
ecore_x_e_illume_indicator_geometry_get(zone, &sx, &sy, &sw, &sh);
|
||||||
#else
|
#else
|
||||||
|
@ -213,8 +214,8 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type)
|
||||||
}
|
}
|
||||||
if (part_type & ELM_CONFORM_VIRTUAL_KEYPAD_PART)
|
if (part_type & ELM_CONFORM_VIRTUAL_KEYPAD_PART)
|
||||||
{
|
{
|
||||||
if (!_conformant_part_geometry_env_get("ILLUME_KBD",
|
if ((!_conformant_part_geometry_env_get("ILLUME_KBD",
|
||||||
&sx, &sy, &sw, &sh)) {
|
&sx, &sy, &sw, &sh)) && (xwin)) {
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
ecore_x_e_illume_keyboard_geometry_get(zone, &sx, &sy, &sw, &sh);
|
ecore_x_e_illume_keyboard_geometry_get(zone, &sx, &sy, &sw, &sh);
|
||||||
#else
|
#else
|
||||||
|
@ -225,8 +226,8 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type)
|
||||||
}
|
}
|
||||||
if (part_type & ELM_CONFORM_SOFTKEY_PART)
|
if (part_type & ELM_CONFORM_SOFTKEY_PART)
|
||||||
{
|
{
|
||||||
if (!_conformant_part_geometry_env_get("ILLUME_STK",
|
if ((!_conformant_part_geometry_env_get("ILLUME_STK",
|
||||||
&sx, &sy, &sw, &sh)) {
|
&sx, &sy, &sw, &sh)) && (xwin)) {
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
ecore_x_e_illume_softkey_geometry_get(zone, &sx, &sy, &sw, &sh);
|
ecore_x_e_illume_softkey_geometry_get(zone, &sx, &sy, &sw, &sh);
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue