forked from enlightenment/efl
elementary/conformant - fixed typo and avoid duplicated.
SVN revision: 79462
This commit is contained in:
parent
53f84c93d8
commit
8cc92d351d
|
@ -11,6 +11,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
EAPI const char ELM_CONFORMANT_SMART_NAME[] = "elm_conformant";
|
EAPI const char ELM_CONFORMANT_SMART_NAME[] = "elm_conformant";
|
||||||
|
static char CONFORMANT_KEY[] = "_elm_conform_key";
|
||||||
|
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
#define SUB_TYPE_COUNT 2
|
#define SUB_TYPE_COUNT 2
|
||||||
|
@ -269,7 +270,7 @@ _port_indicator_connect_cb(void *data)
|
||||||
sd->port_indi_timer = NULL;
|
sd->port_indi_timer = NULL;
|
||||||
return ECORE_CALLBACK_CANCEL;
|
return ECORE_CALLBACK_CANCEL;
|
||||||
}
|
}
|
||||||
rot = (int) evas_object_data_get(sd->portrait_indicator, "_elm_conformant");
|
rot = (int) evas_object_data_get(sd->portrait_indicator, CONFORMANT_KEY);
|
||||||
indicator_serv_name = elm_config_indicator_service_get(rot);
|
indicator_serv_name = elm_config_indicator_service_get(rot);
|
||||||
if (!indicator_serv_name)
|
if (!indicator_serv_name)
|
||||||
{
|
{
|
||||||
|
@ -299,7 +300,7 @@ _land_indicator_connect_cb(void *data)
|
||||||
sd->land_indi_timer = NULL;
|
sd->land_indi_timer = NULL;
|
||||||
return ECORE_CALLBACK_CANCEL;
|
return ECORE_CALLBACK_CANCEL;
|
||||||
}
|
}
|
||||||
rot = (int) evas_object_data_get(sd->landscape_indicator, "_elm_conformant");
|
rot = (int) evas_object_data_get(sd->landscape_indicator, CONFORMANT_KEY);
|
||||||
indicator_serv_name = elm_config_indicator_service_get(rot);
|
indicator_serv_name = elm_config_indicator_service_get(rot);
|
||||||
if (!indicator_serv_name)
|
if (!indicator_serv_name)
|
||||||
{
|
{
|
||||||
|
@ -526,7 +527,7 @@ _on_rotation_changed(void *data,
|
||||||
if (!sd->landscape_indicator) return;
|
if (!sd->landscape_indicator) return;
|
||||||
|
|
||||||
evas_object_show(sd->landscape_indicator);
|
evas_object_show(sd->landscape_indicator);
|
||||||
evas_object_data_set(sd->landscape_indicator, "_elm_conformant_rot", (void *) rot);
|
evas_object_data_set(sd->landscape_indicator, CONFORMANT_KEY, (void *) rot);
|
||||||
elm_layout_content_set(conformant, "elm.swallow.indicator", sd->landscape_indicator);
|
elm_layout_content_set(conformant, "elm.swallow.indicator", sd->landscape_indicator);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -537,7 +538,7 @@ _on_rotation_changed(void *data,
|
||||||
if (!sd->portrait_indicator) return;
|
if (!sd->portrait_indicator) return;
|
||||||
|
|
||||||
evas_object_show(sd->portrait_indicator);
|
evas_object_show(sd->portrait_indicator);
|
||||||
evas_object_data_set(sd->portrait_indicator, "_elm_conformant_rot", (void *) rot);
|
evas_object_data_set(sd->portrait_indicator, CONFORMANT_KEY, (void *) rot);
|
||||||
elm_layout_content_set(conformant, "elm.swallow.indicator", sd->portrait_indicator);
|
elm_layout_content_set(conformant, "elm.swallow.indicator", sd->portrait_indicator);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue