forked from enlightenment/enlightenment
parent
bb171bd77a
commit
375ffb08c5
|
@ -395,3 +395,4 @@ _height_limits_changed(void *data, Evas_Object *obj __UNUSED__)
|
||||||
if (cfdata->min_h > cfdata->max_h)
|
if (cfdata->min_h > cfdata->max_h)
|
||||||
e_widget_slider_value_int_set(cfdata->gui.min_h, cfdata->max_h);
|
e_widget_slider_value_int_set(cfdata->gui.min_h, cfdata->max_h);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
}
|
}
|
||||||
e_winlist_shutdown();
|
e_winlist_shutdown();
|
||||||
|
|
||||||
while ((cfd = e_config_dialog_get("E", "windows/window_list"))) e_object_del(E_OBJECT(cfd));
|
while ((cfd = e_config_dialog_get("E", "windows/window_list")))
|
||||||
|
e_object_del(E_OBJECT(cfd));
|
||||||
e_configure_registry_item_del("windows/window_list");
|
e_configure_registry_item_del("windows/window_list");
|
||||||
e_configure_registry_category_del("windows");
|
e_configure_registry_category_del("windows");
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
|
@ -354,3 +355,4 @@ _e_mod_action_winlist_key_cb(E_Object *obj, const char *params, Ecore_Event_Key
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -122,13 +122,15 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
|
||||||
|
|
||||||
w = (double)zone->w * e_config->winlist_pos_size_w;
|
w = (double)zone->w * e_config->winlist_pos_size_w;
|
||||||
if (w > e_config->winlist_pos_max_w) w = e_config->winlist_pos_max_w;
|
if (w > e_config->winlist_pos_max_w) w = e_config->winlist_pos_max_w;
|
||||||
else if (w < e_config->winlist_pos_min_w) w = e_config->winlist_pos_min_w;
|
else if (w < e_config->winlist_pos_min_w)
|
||||||
|
w = e_config->winlist_pos_min_w;
|
||||||
if (w > zone->w) w = zone->w;
|
if (w > zone->w) w = zone->w;
|
||||||
x = (double)(zone->w - w) * e_config->winlist_pos_align_x;
|
x = (double)(zone->w - w) * e_config->winlist_pos_align_x;
|
||||||
|
|
||||||
h = (double)zone->h * e_config->winlist_pos_size_h;
|
h = (double)zone->h * e_config->winlist_pos_size_h;
|
||||||
if (h > e_config->winlist_pos_max_h) h = e_config->winlist_pos_max_h;
|
if (h > e_config->winlist_pos_max_h) h = e_config->winlist_pos_max_h;
|
||||||
else if (h < e_config->winlist_pos_min_h) h = e_config->winlist_pos_min_h;
|
else if (h < e_config->winlist_pos_min_h)
|
||||||
|
h = e_config->winlist_pos_min_h;
|
||||||
if (h > zone->h) h = zone->h;
|
if (h > zone->h) h = zone->h;
|
||||||
y = (double)(zone->h - h) * e_config->winlist_pos_align_y;
|
y = (double)(zone->h - h) * e_config->winlist_pos_align_y;
|
||||||
|
|
||||||
|
@ -181,11 +183,13 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
|
||||||
pick = !strcmp(_last_border->client.icccm.class,
|
pick = !strcmp(_last_border->client.icccm.class,
|
||||||
bd->client.icccm.class);
|
bd->client.icccm.class);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_WINLIST_FILTER_CLASSES:
|
case E_WINLIST_FILTER_CLASSES:
|
||||||
pick = (!_wmclass_picked(wmclasses, bd->client.icccm.class));
|
pick = (!_wmclass_picked(wmclasses, bd->client.icccm.class));
|
||||||
if (pick)
|
if (pick)
|
||||||
wmclasses = eina_list_append(wmclasses, bd->client.icccm.class);
|
wmclasses = eina_list_append(wmclasses, bd->client.icccm.class);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
pick = EINA_TRUE;
|
pick = EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -411,7 +415,7 @@ e_winlist_left(E_Zone *zone)
|
||||||
bd_orig = e_border_focused_get();
|
bd_orig = e_border_focused_get();
|
||||||
if (!bd_orig) return;
|
if (!bd_orig) return;
|
||||||
|
|
||||||
center = bd_orig->x + bd_orig->w/2;
|
center = bd_orig->x + bd_orig->w / 2;
|
||||||
|
|
||||||
desk = e_desk_current_get(zone);
|
desk = e_desk_current_get(zone);
|
||||||
e_border_focus_track_freeze();
|
e_border_focus_track_freeze();
|
||||||
|
@ -530,7 +534,7 @@ e_winlist_down(E_Zone *zone)
|
||||||
bd_orig = e_border_focused_get();
|
bd_orig = e_border_focused_get();
|
||||||
if (!bd_orig) return;
|
if (!bd_orig) return;
|
||||||
|
|
||||||
center = bd_orig->y + bd_orig->h/2;
|
center = bd_orig->y + bd_orig->h / 2;
|
||||||
|
|
||||||
desk = e_desk_current_get(zone);
|
desk = e_desk_current_get(zone);
|
||||||
e_border_focus_track_freeze();
|
e_border_focus_track_freeze();
|
||||||
|
@ -576,7 +580,7 @@ e_winlist_down(E_Zone *zone)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* bd is suitable */
|
/* bd is suitable */
|
||||||
center_next = bd->y + bd->h/2;
|
center_next = bd->y + bd->h / 2;
|
||||||
if (center_next <= center) continue;
|
if (center_next <= center) continue;
|
||||||
delta_next = bd->y - (bd_orig->y + bd_orig->h);
|
delta_next = bd->y - (bd_orig->y + bd_orig->h);
|
||||||
if (delta_next < 0) delta_next = center - center_next;
|
if (delta_next < 0) delta_next = center - center_next;
|
||||||
|
@ -649,7 +653,7 @@ e_winlist_up(E_Zone *zone)
|
||||||
bd_orig = e_border_focused_get();
|
bd_orig = e_border_focused_get();
|
||||||
if (!bd_orig) return;
|
if (!bd_orig) return;
|
||||||
|
|
||||||
center = bd_orig->y + bd_orig->h/2;
|
center = bd_orig->y + bd_orig->h / 2;
|
||||||
|
|
||||||
desk = e_desk_current_get(zone);
|
desk = e_desk_current_get(zone);
|
||||||
e_border_focus_track_freeze();
|
e_border_focus_track_freeze();
|
||||||
|
@ -695,7 +699,7 @@ e_winlist_up(E_Zone *zone)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* bd is suitable */
|
/* bd is suitable */
|
||||||
center_next = bd->y + bd->h/2;
|
center_next = bd->y + bd->h / 2;
|
||||||
if (center_next >= center) continue;
|
if (center_next >= center) continue;
|
||||||
delta_next = bd_orig->y - (bd->y + bd->h);
|
delta_next = bd_orig->y - (bd->y + bd->h);
|
||||||
if (delta_next < 0) delta_next = center - center_next;
|
if (delta_next < 0) delta_next = center - center_next;
|
||||||
|
@ -768,7 +772,7 @@ e_winlist_right(E_Zone *zone)
|
||||||
bd_orig = e_border_focused_get();
|
bd_orig = e_border_focused_get();
|
||||||
if (!bd_orig) return;
|
if (!bd_orig) return;
|
||||||
|
|
||||||
center = bd_orig->x + bd_orig->w/2;
|
center = bd_orig->x + bd_orig->w / 2;
|
||||||
|
|
||||||
desk = e_desk_current_get(zone);
|
desk = e_desk_current_get(zone);
|
||||||
e_border_focus_track_freeze();
|
e_border_focus_track_freeze();
|
||||||
|
@ -902,13 +906,15 @@ _e_winlist_size_adjust(void)
|
||||||
w = (double)zone->w * e_config->winlist_pos_size_w;
|
w = (double)zone->w * e_config->winlist_pos_size_w;
|
||||||
if (w < mw) w = mw;
|
if (w < mw) w = mw;
|
||||||
if (w > e_config->winlist_pos_max_w) w = e_config->winlist_pos_max_w;
|
if (w > e_config->winlist_pos_max_w) w = e_config->winlist_pos_max_w;
|
||||||
else if (w < e_config->winlist_pos_min_w) w = e_config->winlist_pos_min_w;
|
else if (w < e_config->winlist_pos_min_w)
|
||||||
|
w = e_config->winlist_pos_min_w;
|
||||||
if (w > zone->w) w = zone->w;
|
if (w > zone->w) w = zone->w;
|
||||||
x = (double)(zone->w - w) * e_config->winlist_pos_align_x;
|
x = (double)(zone->w - w) * e_config->winlist_pos_align_x;
|
||||||
|
|
||||||
h = mh;
|
h = mh;
|
||||||
if (h > e_config->winlist_pos_max_h) h = e_config->winlist_pos_max_h;
|
if (h > e_config->winlist_pos_max_h) h = e_config->winlist_pos_max_h;
|
||||||
else if (h < e_config->winlist_pos_min_h) h = e_config->winlist_pos_min_h;
|
else if (h < e_config->winlist_pos_min_h)
|
||||||
|
h = e_config->winlist_pos_min_h;
|
||||||
if (h > zone->h) h = zone->h;
|
if (h > zone->h) h = zone->h;
|
||||||
y = (double)(zone->h - h) * e_config->winlist_pos_align_y;
|
y = (double)(zone->h - h) * e_config->winlist_pos_align_y;
|
||||||
|
|
||||||
|
@ -1052,7 +1058,8 @@ _e_winlist_activate(void)
|
||||||
if (!_win_selected) return;
|
if (!_win_selected) return;
|
||||||
ww = _win_selected->data;
|
ww = _win_selected->data;
|
||||||
edje_object_signal_emit(ww->bg_object, "e,state,selected", "e");
|
edje_object_signal_emit(ww->bg_object, "e,state,selected", "e");
|
||||||
if (ww->icon_object) edje_object_signal_emit(ww->icon_object,
|
if (ww->icon_object)
|
||||||
|
edje_object_signal_emit(ww->icon_object,
|
||||||
"e,state,selected", "e");
|
"e,state,selected", "e");
|
||||||
|
|
||||||
if ((ww->border->iconic) &&
|
if ((ww->border->iconic) &&
|
||||||
|
@ -1186,7 +1193,8 @@ _e_winlist_deactivate(void)
|
||||||
}
|
}
|
||||||
edje_object_part_text_set(_bg_object, "e.text.label", "");
|
edje_object_part_text_set(_bg_object, "e.text.label", "");
|
||||||
edje_object_signal_emit(ww->bg_object, "e,state,unselected", "e");
|
edje_object_signal_emit(ww->bg_object, "e,state,unselected", "e");
|
||||||
if (ww->icon_object) edje_object_signal_emit(ww->icon_object,
|
if (ww->icon_object)
|
||||||
|
edje_object_signal_emit(ww->icon_object,
|
||||||
"e,state,unselected", "e");
|
"e,state,unselected", "e");
|
||||||
if (!ww->border->lock_focus_in)
|
if (!ww->border->lock_focus_in)
|
||||||
e_border_focus_set(ww->border, 0, 0);
|
e_border_focus_set(ww->border, 0, 0);
|
||||||
|
@ -1395,7 +1403,7 @@ _e_winlist_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||||
|
|
||||||
EINA_LIST_FOREACH(e_config->key_bindings, l, binding)
|
EINA_LIST_FOREACH(e_config->key_bindings, l, binding)
|
||||||
{
|
{
|
||||||
if (binding->action && strcmp(binding->action,"winlist")) continue;
|
if (binding->action && strcmp(binding->action, "winlist")) continue;
|
||||||
mod = 0;
|
mod = 0;
|
||||||
|
|
||||||
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
|
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
|
||||||
|
@ -1596,4 +1604,5 @@ _e_winlist_cb_item_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *even
|
||||||
_e_winlist_show_active();
|
_e_winlist_show_active();
|
||||||
_e_winlist_activate();
|
_e_winlist_activate();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue