vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Play nice w/ smaller resolutions. 

SVN revision: 50619
This commit is contained in:
Christopher Michael 2010-07-28 22:23:05 +00:00
parent bf2f06a69f
commit 66d0bc6f78
1 changed files with 130 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

399
src/modules/conf_winlist/e_int_config_winlist.c
View File

@ -5,28 +5,25 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _advanced_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_advanced_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static void _sync_advanced_to_basic(E_Config_Dialog_Data *cfdata);
static void _iconified_changed(void *data, Evas_Object *obj);
static void _warp_changed(void *data, Evas_Object *obj __UNUSED__);
static void _scroll_animate_changed(void *data, Evas_Object *obj);
static void _width_limits_changed(void *data, Evas_Object *obj __UNUSED__);
static void _height_limits_changed(void *data, Evas_Object *obj __UNUSED__);
struct _E_Config_Dialog_Data
{
/* basic */
int other_desks, other_screens;
int iconified, animations;
int focus, raise, uncover, warp;
int jump_desk;
/* Advanced */
int windows_other_desks;
int windows_other_screens;
int iconified;
int iconified_other_desks;
int iconified_other_screens;
int focus, raise, uncover;
int warp_while_selecting;
int warp_at_end;
double warp_speed;
int jump_desk;
int scroll_animate;
double scroll_speed;
@ -57,9 +54,6 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
v->basic.apply_cfdata = _basic_apply;
v->basic.create_widgets = _basic_create;
v->basic.check_changed = _basic_check_changed;
v->advanced.apply_cfdata = _advanced_apply;
v->advanced.create_widgets = _advanced_create;
v->advanced.check_changed = _advanced_check_changed;
cfd = e_config_dialog_new(con, _("Window List Settings"),
"E", "advanced/window_list",
@ -99,8 +93,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->min_h = e_config->winlist_pos_min_h;
cfdata->max_w = e_config->winlist_pos_max_w;
cfdata->max_h = e_config->winlist_pos_max_h;
_sync_advanced_to_basic(cfdata);
}
static void *
@ -123,56 +115,9 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
E_FREE(cfdata);
}
static void
_sync_basic_to_advanced(E_Config_Dialog_Data *cfdata)
{
if (cfdata->iconified)
{
cfdata->iconified_other_desks = cfdata->other_desks;
cfdata->iconified_other_screens = cfdata->other_screens;
}
else
{
cfdata->iconified_other_desks = EINA_FALSE;
cfdata->iconified_other_screens = EINA_FALSE;
}
cfdata->windows_other_desks = cfdata->other_desks;
cfdata->windows_other_screens = cfdata->other_screens;
cfdata->warp_at_end = cfdata->warp;
cfdata->warp_while_selecting = cfdata->warp;
cfdata->scroll_animate = cfdata->animations;
if (cfdata->animations)
{
if (cfdata->scroll_speed <= 0.0)
cfdata->scroll_speed = 0.5;
if (cfdata->warp_speed <= 0.0)
cfdata->warp_speed = 0.5;
}
}
static void
_sync_advanced_to_basic(E_Config_Dialog_Data *cfdata)
{
cfdata->other_desks =
(cfdata->windows_other_desks || cfdata->iconified_other_desks);
cfdata->other_screens =
(cfdata->windows_other_screens || cfdata->iconified_other_screens);
cfdata->animations =
(cfdata->scroll_animate || (cfdata->warp_speed > 0.0));
cfdata->warp =
(cfdata->warp_while_selecting || cfdata->warp_at_end);
}
static int
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
_sync_basic_to_advanced(cfdata);
#define DO(_e_config, _cfdata) \
e_config->winlist_##_e_config = cfdata->_cfdata
@ -190,6 +135,12 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
DO(scroll_speed, scroll_speed);
DO(list_focus_while_selecting, focus);
DO(list_raise_while_selecting, raise);
DO(pos_align_x, align_x);
DO(pos_align_y, align_y);
DO(pos_min_w, min_w);
DO(pos_min_h, min_h);
DO(pos_max_w, max_w);
DO(pos_max_h, max_h);
#undef DO
e_config_save_queue();
@ -200,214 +151,36 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
int i_other_desks, i_other_screens;
#define DO(_e_config, _cfdata) \
if (e_config->winlist_##_e_config != cfdata->_cfdata) return 1;
DO(list_show_iconified, iconified);
DO(list_show_other_desk_windows, other_desks);
DO(list_show_other_screen_windows, other_screens);
DO(list_show_other_desk_iconified, iconified_other_desks);
DO(list_show_other_screen_iconified, iconified_other_screens);
DO(list_show_other_desk_windows, windows_other_desks);
DO(list_show_other_screen_windows, windows_other_screens);
DO(list_uncover_while_selecting, uncover);
DO(list_jump_desk_while_selecting, jump_desk);
DO(warp_while_selecting, warp);
DO(warp_at_end, warp);
DO(scroll_animate, animations);
DO(warp_while_selecting, warp_while_selecting);
DO(warp_at_end, warp_at_end);
DO(warp_speed, warp_speed);
DO(scroll_animate, scroll_animate);
DO(scroll_speed, scroll_speed);
DO(list_focus_while_selecting, focus);
DO(list_raise_while_selecting, raise);
DO(pos_align_x, align_x);
DO(pos_align_y, align_y);
DO(pos_min_w, min_w);
DO(pos_min_h, min_h);
DO(pos_max_w, max_w);
DO(pos_max_h, max_h);
#undef DO
if (cfdata->iconified)
{
i_other_desks = cfdata->other_desks;
i_other_screens = cfdata->other_screens;
}
else
{
i_other_desks = EINA_FALSE;
i_other_screens = EINA_FALSE;
}
if (e_config->winlist_list_show_other_desk_iconified != i_other_desks)
return 1;
if (e_config->winlist_list_show_other_screen_iconified != i_other_screens)
return 1;
if (cfdata->animations)
{
double scroll_speed, warp_speed;
scroll_speed = cfdata->scroll_speed;
warp_speed = cfdata->warp_speed;
if (scroll_speed <= 0.0) scroll_speed = 0.5;
if (warp_speed <= 0.0) warp_speed = 0.5;
if (e_config->winlist_scroll_speed != scroll_speed) return 1;
if (e_config->winlist_warp_speed != warp_speed) return 1;
}
return 0;
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Display"), 0);
ob = e_widget_check_add(evas, _("From other desks"), &(cfdata->other_desks));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("From other screens"),
&(cfdata->other_screens));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Iconified"), &(cfdata->iconified));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Animations"), &(cfdata->animations));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Selecting"), 0);
ob = e_widget_check_add(evas, _("Focus"), &(cfdata->focus));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Raise"), &(cfdata->raise));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Uncover"), &(cfdata->uncover));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Warp mouse"), &(cfdata->warp));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Jump to desk"), &(cfdata->jump_desk));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
static int
_advanced_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
_sync_advanced_to_basic(cfdata);
#define DO(_e_config, _cfdata) \
e_config->winlist_##_e_config = cfdata->_cfdata
DO(list_show_iconified, iconified);
DO(list_show_other_desk_iconified, iconified_other_desks);
DO(list_show_other_screen_iconified, iconified_other_screens);
DO(list_show_other_desk_windows, windows_other_desks);
DO(list_show_other_screen_windows, windows_other_screens);
DO(list_uncover_while_selecting, uncover);
DO(list_jump_desk_while_selecting, jump_desk);
DO(warp_while_selecting, warp_while_selecting);
DO(warp_at_end, warp_at_end);
DO(warp_speed, warp_speed);
DO(scroll_animate, scroll_animate);
DO(scroll_speed, scroll_speed);
DO(list_focus_while_selecting, focus);
DO(list_raise_while_selecting, raise);
DO(pos_align_x, align_x);
DO(pos_align_y, align_y);
DO(pos_min_w, min_w);
DO(pos_min_h, min_h);
DO(pos_max_w, max_w);
DO(pos_max_h, max_h);
#undef DO
e_config_save_queue();
return 1;
}
static int
_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
#define DO(_e_config, _cfdata) \
if (e_config->winlist_##_e_config != cfdata->_cfdata) return 1;
DO(list_show_iconified, iconified);
DO(list_show_other_desk_iconified, iconified_other_desks);
DO(list_show_other_screen_iconified, iconified_other_screens);
DO(list_show_other_desk_windows, windows_other_desks);
DO(list_show_other_screen_windows, windows_other_screens);
DO(list_uncover_while_selecting, uncover);
DO(list_jump_desk_while_selecting, jump_desk);
DO(warp_while_selecting, warp_while_selecting);
DO(warp_at_end, warp_at_end);
DO(warp_speed, warp_speed);
DO(scroll_animate, scroll_animate);
DO(scroll_speed, scroll_speed);
DO(list_focus_while_selecting, focus);
DO(list_raise_while_selecting, raise);
DO(pos_align_x, align_x);
DO(pos_align_y, align_y);
DO(pos_min_w, min_w);
DO(pos_min_h, min_h);
DO(pos_max_w, max_w);
DO(pos_max_h, max_h);
#undef DO
return 0;
}
static void
_iconified_changed(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata = data;
const Eina_List *l;
Evas_Object *o;
Eina_Bool disabled = !e_widget_check_checked_get(obj);
EINA_LIST_FOREACH(cfdata->gui.disable_iconified, l, o)
e_widget_disabled_set(o, disabled);
}
static void
_warp_changed(void *data, Evas_Object *obj __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
const Eina_List *l;
Evas_Object *o;
Eina_Bool disabled;
disabled = ((!cfdata->warp_while_selecting) && (!cfdata->warp_at_end));
EINA_LIST_FOREACH(cfdata->gui.disable_warp, l, o)
e_widget_disabled_set(o, disabled);
}
static void
_scroll_animate_changed(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata = data;
const Eina_List *l;
Evas_Object *o;
Eina_Bool disabled = !e_widget_check_checked_get(obj);
EINA_LIST_FOREACH(cfdata->gui.disable_scroll_animate, l, o)
e_widget_disabled_set(o, disabled);
}
static void
_width_limits_changed(void *data, Evas_Object *obj __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
if (cfdata->min_w > cfdata->max_w)
e_widget_slider_value_int_set(cfdata->gui.min_w, cfdata->max_w);
}
static void
_height_limits_changed(void *data, Evas_Object *obj __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
if (cfdata->min_h > cfdata->max_h)
e_widget_slider_value_int_set(cfdata->gui.min_h, cfdata->max_h);
}
static Evas_Object *
_advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *otb, *ol, *ob, *iconified, *scroll_animate;
Evas_Coord mw, mh;
@ -485,16 +258,6 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da
0, 0, 1, 0, 0.5, 0.0);
ol = e_widget_list_add(evas, 0, 0);
ob = e_widget_label_add(evas, _("Horizontal alignment"));
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0,
&(cfdata->align_x), NULL, 100);
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
ob = e_widget_label_add(evas, _("Vertical alignment"));
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0,
&(cfdata->align_y), NULL, 100);
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
ob = e_widget_label_add(evas, _("Minimum width"));
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 10, 0, NULL,
@ -524,14 +287,112 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da
e_widget_toolbook_page_append(otb, NULL, _("Geometry"), ol,
0, 0, 1, 0, 0.5, 0.0);
ol = e_widget_list_add(evas, 0, 0);
ob = e_widget_label_add(evas, _("Horizontal alignment"));
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0,
&(cfdata->align_x), NULL, 100);
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
ob = e_widget_label_add(evas, _("Vertical alignment"));
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0,
&(cfdata->align_y), NULL, 100);
e_widget_list_object_append(ol, ob, 1, 0, 0.0);
e_widget_toolbook_page_append(otb, NULL, _("Alignment"), ol,
0, 0, 1, 0, 0.5, 0.0);
_iconified_changed(cfdata, iconified);
_warp_changed(cfdata, NULL);
_scroll_animate_changed(cfdata, scroll_animate);
e_widget_toolbook_page_show(otb, 0);
e_widget_size_min_get(otb, &mw, &mh);
if (mw < 200 * e_scale) e_widget_size_min_set(otb, 200 * e_scale, mh);
return otb;
/*
Evas_Object *o, *of, *ob;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Display"), 0);
ob = e_widget_check_add(evas, _("From other desks"), &(cfdata->other_desks));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("From other screens"),
&(cfdata->other_screens));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Iconified"), &(cfdata->iconified));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Animations"), &(cfdata->animations));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Selecting"), 0);
ob = e_widget_check_add(evas, _("Focus"), &(cfdata->focus));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Raise"), &(cfdata->raise));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Uncover"), &(cfdata->uncover));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Warp mouse"), &(cfdata->warp));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Jump to desk"), &(cfdata->jump_desk));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
*/
}
static void
_iconified_changed(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata = data;
const Eina_List *l;
Evas_Object *o;
Eina_Bool disabled = !e_widget_check_checked_get(obj);
EINA_LIST_FOREACH(cfdata->gui.disable_iconified, l, o)
e_widget_disabled_set(o, disabled);
}
static void
_warp_changed(void *data, Evas_Object *obj __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
const Eina_List *l;
Evas_Object *o;
Eina_Bool disabled;
disabled = ((!cfdata->warp_while_selecting) && (!cfdata->warp_at_end));
EINA_LIST_FOREACH(cfdata->gui.disable_warp, l, o)
e_widget_disabled_set(o, disabled);
}
static void
_scroll_animate_changed(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata = data;
const Eina_List *l;
Evas_Object *o;
Eina_Bool disabled = !e_widget_check_checked_get(obj);
EINA_LIST_FOREACH(cfdata->gui.disable_scroll_animate, l, o)
e_widget_disabled_set(o, disabled);
}
static void
_width_limits_changed(void *data, Evas_Object *obj __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
if (cfdata->min_w > cfdata->max_w)
e_widget_slider_value_int_set(cfdata->gui.min_w, cfdata->max_w);
}
static void
_height_limits_changed(void *data, Evas_Object *obj __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
if (cfdata->min_h > cfdata->max_h)
e_widget_slider_value_int_set(cfdata->gui.min_h, cfdata->max_h);
}