Merge branch 'terminology-1.5'
This commit is contained in:
commit
16f067cb0a
|
@ -116,4 +116,6 @@ void config_reset_keys(Config *config);
|
|||
const char *config_theme_path_get(const Config *config);
|
||||
const char *config_theme_path_default_get(const Config *config);
|
||||
|
||||
#define CONFIG_CURSOR_IDLE_TIMEOUT_MAX 60.0
|
||||
|
||||
#endif
|
||||
|
|
|
@ -221,7 +221,7 @@ _cb_op_hide_cursor_changed(void *data,
|
|||
}
|
||||
else
|
||||
{
|
||||
config->hide_cursor = INFINITY;
|
||||
config->hide_cursor = CONFIG_CURSOR_IDLE_TIMEOUT_MAX + 1.0;
|
||||
elm_object_disabled_set(ctx->sld_hide_cursor, EINA_TRUE);
|
||||
}
|
||||
config_save(config, NULL);
|
||||
|
@ -629,7 +629,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
|
|||
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
|
||||
elm_object_text_set(o, _("Translucent"));
|
||||
elm_object_text_set(o, _("Auto hide the mouse cursor when idle:"));
|
||||
elm_check_state_set(o, !isnan(config->hide_cursor));
|
||||
elm_check_state_set(o, config->hide_cursor < CONFIG_CURSOR_IDLE_TIMEOUT_MAX);
|
||||
elm_box_pack_end(bx, o);
|
||||
evas_object_show(o);
|
||||
evas_object_smart_callback_add(o, "changed",
|
||||
|
@ -643,7 +643,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
|
|||
elm_slider_span_size_set(o, 40);
|
||||
elm_slider_unit_format_set(o, _("%1.1f s"));
|
||||
elm_slider_indicator_format_set(o, _("%1.1f s"));
|
||||
elm_slider_min_max_set(o, 0.0, 60.0);
|
||||
elm_slider_min_max_set(o, 0.0, CONFIG_CURSOR_IDLE_TIMEOUT_MAX);
|
||||
elm_slider_value_set(o, config->hide_cursor);
|
||||
elm_box_pack_end(bx, o);
|
||||
evas_object_show(o);
|
||||
|
|
|
@ -1609,7 +1609,7 @@ _cb_win_mouse_move(void *data,
|
|||
if (wn->on_popover)
|
||||
return;
|
||||
|
||||
if (!isnan(wn->config->hide_cursor))
|
||||
if (wn->config->hide_cursor < CONFIG_CURSOR_IDLE_TIMEOUT_MAX)
|
||||
{
|
||||
if (wn->hide_cursor_timer)
|
||||
{
|
||||
|
@ -1819,7 +1819,7 @@ imf_done:
|
|||
|
||||
}
|
||||
|
||||
if (!isnan(wn->config->hide_cursor))
|
||||
if (wn->config->hide_cursor < CONFIG_CURSOR_IDLE_TIMEOUT_MAX)
|
||||
{
|
||||
wn->hide_cursor_timer = ecore_timer_add(
|
||||
wn->config->hide_cursor, _hide_cursor, wn);
|
||||
|
|
Loading…
Reference in New Issue