summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-05 14:22:54 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-05 14:22:54 +0000
commitfcd92901fc7581b36098988b4d571187679db3ad (patch)
treea01fb248a00a655f34284fa6bf1a0c6fb43ff802
parentd7c52deb98dfa2a2df9190cbfa663735acbbdd1d (diff)
winlist_warp_speed->pointer_warp_speed
pointer warp options consolidated into their own tab in focus settings SVN revision: 83633
Diffstat (limited to '')
-rw-r--r--ChangeLog3
-rw-r--r--NEWS6
-rw-r--r--src/bin/e_config.c8
-rw-r--r--src/bin/e_config.h5
-rw-r--r--src/bin/e_configure_option.c4
-rw-r--r--src/modules/conf_window_manipulation/e_int_config_focus.c44
-rw-r--r--src/modules/winlist/e_int_config_winlist.c12
7 files changed, 51 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 23eb9c14a..0e517b830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf 4 * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf
5 * edge bindings can now be set to "drag only" 5 * edge bindings can now be set to "drag only"
6 * merged all binding config dialogs into conf_bindings module 6 * merged all binding config dialogs into conf_bindings module
7 * new option for disabling all pointer warps
8 * move pointer warp speed option to be general option
9 * new tab in focus settings for pointer warping
7 10
82013-02-04 Mike Blumenkrantz 112013-02-04 Mike Blumenkrantz
9 12
diff --git a/NEWS b/NEWS
index fdc3bbd60..13f256416 100644
--- a/NEWS
+++ b/NEWS
@@ -31,16 +31,19 @@ Additions:
31 * added options and functionality for "fast" composite effects 31 * added options and functionality for "fast" composite effects
32 * split comp window match settings into separate dialog 32 * split comp window match settings into separate dialog
33 * edge bindings can now be set to "drag only" 33 * edge bindings can now be set to "drag only"
34 * new option for disabling all pointer warps
34 35
35Changes: 36Changes:
36 Modules: 37 Modules:
37 * modules no longer require shutdown or save functions 38 * modules no longer require shutdown or save functions
38 * merged all binding config dialogs into conf_bindings module 39 * merged all binding config dialogs into conf_bindings module
39
40 API: 40 API:
41 * e_menu_category_callback create callback parameter order has been changed 41 * e_menu_category_callback create callback parameter order has been changed
42 * e_manager_comp_set() is no longer accessible by modules 42 * e_manager_comp_set() is no longer accessible by modules
43 * e_xkb_layout API now deals directly with E_Config_XKB_Layout structs 43 * e_xkb_layout API now deals directly with E_Config_XKB_Layout structs
44 Config:
45 * move winlist_warp_speed option to pointer_warp_speed
46
44 47
45Deprecations: 48Deprecations:
46 * 49 *
@@ -86,6 +89,7 @@ Improvements:
86 * optimize use of edje_file_collection_list 89 * optimize use of edje_file_collection_list
87 * add support for edje files in filepreview widget 90 * add support for edje files in filepreview widget
88 * improve load time of apps dialogs 91 * improve load time of apps dialogs
92 * new tab in focus settings for pointer warping
89 93
90Fixes: 94Fixes:
91 * IBar menu didn't allow to configure different icon sources, show contents menu even on empty IBar. 95 * IBar menu didn't allow to configure different icon sources, show contents menu even on empty IBar.
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index ce70e32f6..77e7e0a84 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -631,6 +631,7 @@ _e_config_edd_init(Eina_Bool old)
631 E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/ 631 E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/
632 E_CONFIG_VAL(D, T, pointer_slide, INT); /**/ 632 E_CONFIG_VAL(D, T, pointer_slide, INT); /**/
633 E_CONFIG_VAL(D, T, disable_all_pointer_warps, INT); /**/ 633 E_CONFIG_VAL(D, T, disable_all_pointer_warps, INT); /**/
634 E_CONFIG_VAL(D, T, pointer_warp_speed, DOUBLE); /**/
634 E_CONFIG_VAL(D, T, use_e_cursor, INT); /**/ 635 E_CONFIG_VAL(D, T, use_e_cursor, INT); /**/
635 E_CONFIG_VAL(D, T, cursor_size, INT); /**/ 636 E_CONFIG_VAL(D, T, cursor_size, INT); /**/
636 E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/ 637 E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/
@@ -1290,6 +1291,12 @@ e_config_load(void)
1290 e_config->modules = eina_list_append(e_config->modules, em); 1291 e_config->modules = eina_list_append(e_config->modules, em);
1291 } 1292 }
1292 } 1293 }
1294 CONFIG_VERSION_CHECK(11)
1295 {
1296 CONFIG_VERSION_UPDATE_INFO(11);
1297 e_config->pointer_warp_speed = e_config->winlist_warp_speed;
1298 e_config->winlist_warp_speed = 0;
1299 }
1293 } 1300 }
1294 if (!e_config->remember_internal_fm_windows) 1301 if (!e_config->remember_internal_fm_windows)
1295 e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS); 1302 e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS);
@@ -1370,6 +1377,7 @@ e_config_load(void)
1370 E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1); 1377 E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1);
1371 E_CONFIG_LIMIT(e_config->pointer_slide, 0, 1); 1378 E_CONFIG_LIMIT(e_config->pointer_slide, 0, 1);
1372 E_CONFIG_LIMIT(e_config->disable_all_pointer_warps, 0, 1); 1379 E_CONFIG_LIMIT(e_config->disable_all_pointer_warps, 0, 1);
1380 E_CONFIG_LIMIT(e_config->pointer_warp_speed, 0.0, 1.0);
1373 E_CONFIG_LIMIT(e_config->show_cursor, 0, 1); 1381 E_CONFIG_LIMIT(e_config->show_cursor, 0, 1);
1374 E_CONFIG_LIMIT(e_config->use_e_cursor, 0, 1); 1382 E_CONFIG_LIMIT(e_config->use_e_cursor, 0, 1);
1375 E_CONFIG_LIMIT(e_config->cursor_size, 0, 1024); 1383 E_CONFIG_LIMIT(e_config->cursor_size, 0, 1024);
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 473b85ae7..10ef9f670 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -48,7 +48,7 @@ typedef enum
48/* increment this whenever a new set of config values are added but the users 48/* increment this whenever a new set of config values are added but the users
49 * config doesn't need to be wiped - simply new values need to be put in 49 * config doesn't need to be wiped - simply new values need to be put in
50 */ 50 */
51#define E_CONFIG_FILE_GENERATION 10 51#define E_CONFIG_FILE_GENERATION 11
52#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION) 52#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
53 53
54#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!! 54#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!!
@@ -128,7 +128,7 @@ struct _E_Config
128 int winlist_warp_while_selecting; // GUI 128 int winlist_warp_while_selecting; // GUI
129 int winlist_warp_at_end; // GUI 129 int winlist_warp_at_end; // GUI
130 int winlist_no_warp_on_direction; // GUI 130 int winlist_no_warp_on_direction; // GUI
131 double winlist_warp_speed; // GUI 131 double winlist_warp_speed; // GUI **** NO LONGER USED!!!
132 int winlist_scroll_animate; // GUI 132 int winlist_scroll_animate; // GUI
133 double winlist_scroll_speed; // GUI 133 double winlist_scroll_speed; // GUI
134 int winlist_list_show_iconified; // GUI 134 int winlist_list_show_iconified; // GUI
@@ -170,6 +170,7 @@ struct _E_Config
170 int focus_revert_on_hide_or_close; // GUI 170 int focus_revert_on_hide_or_close; // GUI
171 int disable_all_pointer_warps; // GUI 171 int disable_all_pointer_warps; // GUI
172 int pointer_slide; // GUI 172 int pointer_slide; // GUI
173 double pointer_warp_speed; // GUI
173 int use_e_cursor; // GUI 174 int use_e_cursor; // GUI
174 int cursor_size; // GUI 175 int cursor_size; // GUI
175 int menu_autoscroll_margin; // GUI 176 int menu_autoscroll_margin; // GUI
diff --git a/src/bin/e_configure_option.c b/src/bin/e_configure_option.c
index 940d37343..99fc4f3d6 100644
--- a/src/bin/e_configure_option.c
+++ b/src/bin/e_configure_option.c
@@ -1580,6 +1580,8 @@ e_configure_option_init(void)
1580 OPT_ADD(BOOL, focus_revert_on_hide_or_close, _("Revert window focus on window hide or close"), _("border"), _("focus")); 1580 OPT_ADD(BOOL, focus_revert_on_hide_or_close, _("Revert window focus on window hide or close"), _("border"), _("focus"));
1581 OPT_ADD(BOOL, pointer_slide, _("Warp pointer to new windows and away from closed windows"), _("border"), _("focus"), _("warp"), _("pointer")); 1581 OPT_ADD(BOOL, pointer_slide, _("Warp pointer to new windows and away from closed windows"), _("border"), _("focus"), _("warp"), _("pointer"));
1582 OPT_ADD(BOOL, disable_all_pointer_warps, _("Prevent all forms of pointer warping"), _("border"), _("focus"), _("warp"), _("pointer")); 1582 OPT_ADD(BOOL, disable_all_pointer_warps, _("Prevent all forms of pointer warping"), _("border"), _("focus"), _("warp"), _("pointer"));
1583 OPT_ADD(DOUBLE, pointer_warp_speed, _("Speed to move pointer when warping between windows"), _("border"), _("focus"), _("warp"), _("pointer"), _("speed"));
1584 OPT_MINMAX_STEP_FMT(0.0, 1.0, 0.01, "%1.2f");
1583 OPT_ADD(BOOL, border_raise_on_mouse_action, _("Windows raise on mouse move/resize"), _("border"), _("raise"), _("focus"), _("mouse"), _("pointer"), _("move"), _("resize")); 1585 OPT_ADD(BOOL, border_raise_on_mouse_action, _("Windows raise on mouse move/resize"), _("border"), _("raise"), _("focus"), _("mouse"), _("pointer"), _("move"), _("resize"));
1584 OPT_ADD(BOOL, border_raise_on_focus, _("Windows raise when focused"), _("border"), _("raise"), _("focus"), _("mouse")); 1586 OPT_ADD(BOOL, border_raise_on_focus, _("Windows raise when focused"), _("border"), _("raise"), _("focus"), _("mouse"));
1585 1587
@@ -1604,8 +1606,6 @@ e_configure_option_init(void)
1604 OPT_ADD(BOOL, winlist_warp_at_end, _("Winlist moves pointer to currently selected window after winlist closes"), _("border"), _("winlist"), _("focus"), _("warp"), _("pointer")); 1606 OPT_ADD(BOOL, winlist_warp_at_end, _("Winlist moves pointer to currently selected window after winlist closes"), _("border"), _("winlist"), _("focus"), _("warp"), _("pointer"));
1605 OPT_ADD(BOOL, winlist_no_warp_on_direction, _("Disable pointer warping on winlist directional focus change"), _("border"), _("winlist"), _("focus"), _("warp"), _("pointer")); 1607 OPT_ADD(BOOL, winlist_no_warp_on_direction, _("Disable pointer warping on winlist directional focus change"), _("border"), _("winlist"), _("focus"), _("warp"), _("pointer"));
1606 OPT_HELP(_("This option, when enabled, disables pointer warping only when switching windows using a directional winlist action (up/down/left/right)")); 1608 OPT_HELP(_("This option, when enabled, disables pointer warping only when switching windows using a directional winlist action (up/down/left/right)"));
1607 OPT_ADD(DOUBLE, winlist_warp_speed, _("Winlist pointer warp speed while selecting"), _("border"), _("winlist"), _("focus"), _("warp"), _("pointer"), _("speed"));
1608 OPT_MINMAX_STEP_FMT(0.0, 1.0, 0.01, "%1.2f");
1609 OPT_ADD(BOOL, winlist_scroll_animate, _("Enable winlist scroll animation"), _("border"), _("winlist"), _("animate")); 1609 OPT_ADD(BOOL, winlist_scroll_animate, _("Enable winlist scroll animation"), _("border"), _("winlist"), _("animate"));
1610 OPT_ADD(DOUBLE, winlist_scroll_speed, _("Winlist scroll speed"), _("border"), _("winlist"), _("animate"), _("speed")); 1610 OPT_ADD(DOUBLE, winlist_scroll_speed, _("Winlist scroll speed"), _("border"), _("winlist"), _("animate"), _("speed"));
1611 OPT_MINMAX_STEP_FMT(0.0, 1.0, 0.01, "%1.2f"); 1611 OPT_MINMAX_STEP_FMT(0.0, 1.0, 0.01, "%1.2f");
diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c
index a1f346cd9..b4ffdde78 100644
--- a/src/modules/conf_window_manipulation/e_int_config_focus.c
+++ b/src/modules/conf_window_manipulation/e_int_config_focus.c
@@ -29,6 +29,7 @@ struct _E_Config_Dialog_Data
29 int focus_revert_on_hide_or_close; 29 int focus_revert_on_hide_or_close;
30 int pointer_slide; 30 int pointer_slide;
31 int disable_all_pointer_warps; 31 int disable_all_pointer_warps;
32 double pointer_warp_speed;
32 double auto_raise_delay; 33 double auto_raise_delay;
33 int border_raise_on_mouse_action; 34 int border_raise_on_mouse_action;
34 int border_raise_on_focus; 35 int border_raise_on_focus;
@@ -79,6 +80,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
79 e_config->focus_revert_on_hide_or_close; 80 e_config->focus_revert_on_hide_or_close;
80 cfdata->pointer_slide = e_config->pointer_slide; 81 cfdata->pointer_slide = e_config->pointer_slide;
81 cfdata->disable_all_pointer_warps = e_config->disable_all_pointer_warps; 82 cfdata->disable_all_pointer_warps = e_config->disable_all_pointer_warps;
83 cfdata->pointer_warp_speed = e_config->pointer_warp_speed;
82 84
83 cfdata->mode = cfdata->focus_policy; 85 cfdata->mode = cfdata->focus_policy;
84 86
@@ -187,6 +189,7 @@ _advanced_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
187 cfdata->focus_revert_on_hide_or_close; 189 cfdata->focus_revert_on_hide_or_close;
188 e_config->pointer_slide = cfdata->pointer_slide; 190 e_config->pointer_slide = cfdata->pointer_slide;
189 e_config->disable_all_pointer_warps = cfdata->disable_all_pointer_warps; 191 e_config->disable_all_pointer_warps = cfdata->disable_all_pointer_warps;
192 e_config->pointer_warp_speed = cfdata->pointer_warp_speed;
190 193
191 e_config->use_auto_raise = cfdata->use_auto_raise; 194 e_config->use_auto_raise = cfdata->use_auto_raise;
192 e_config->auto_raise_delay = cfdata->auto_raise_delay; 195 e_config->auto_raise_delay = cfdata->auto_raise_delay;
@@ -211,6 +214,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c
211 (e_config->focus_revert_on_hide_or_close != cfdata->focus_revert_on_hide_or_close) || 214 (e_config->focus_revert_on_hide_or_close != cfdata->focus_revert_on_hide_or_close) ||
212 (e_config->pointer_slide != cfdata->pointer_slide) || 215 (e_config->pointer_slide != cfdata->pointer_slide) ||
213 (e_config->disable_all_pointer_warps != cfdata->disable_all_pointer_warps) || 216 (e_config->disable_all_pointer_warps != cfdata->disable_all_pointer_warps) ||
217 (fabs(e_config->pointer_warp_speed - cfdata->pointer_warp_speed) < DBL_EPSILON) ||
214 (e_config->use_auto_raise != cfdata->use_auto_raise) || 218 (e_config->use_auto_raise != cfdata->use_auto_raise) ||
215 (e_config->auto_raise_delay != cfdata->auto_raise_delay) || 219 (e_config->auto_raise_delay != cfdata->auto_raise_delay) ||
216 (e_config->border_raise_on_mouse_action != cfdata->border_raise_on_mouse_action) || 220 (e_config->border_raise_on_mouse_action != cfdata->border_raise_on_mouse_action) ||
@@ -323,6 +327,32 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da
323 e_widget_framelist_object_append(of, ob); 327 e_widget_framelist_object_append(of, ob);
324 e_widget_toolbook_page_append(otb, NULL, _("Hints"), of, 328 e_widget_toolbook_page_append(otb, NULL, _("Hints"), of,
325 1, 0, 1, 0, 0.5, 0.0); 329 1, 0, 1, 0, 0.5, 0.0);
330 /* Pointer */
331 ol = e_widget_list_add(evas, 0, 0);
332 of = e_widget_framelist_add(evas, _("Warping"), 0);
333 /* NOTE/TODO:
334 *
335 * IMHO all these slide-pointer-to-window, warp and all should have
336 * an unique and consistent setting. In some cases it just do not
337 * make sense to have one but not the other.
338 */
339
340 ob = e_widget_check_add(evas, _("Slide pointer to a new window which is focused"),
341 &(cfdata->pointer_slide));
342 e_widget_framelist_object_append(of, ob);
343
344 ob = e_widget_check_add(evas, _("Prevent all forms of pointer warping"),
345 &(cfdata->disable_all_pointer_warps));
346 e_widget_framelist_object_append(of, ob);
347 ob = e_widget_label_add(evas, _("Warp speed"));
348 e_widget_framelist_object_append(of, ob);
349 ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0,
350 &(cfdata->pointer_warp_speed), NULL, 100);
351 e_widget_framelist_object_append(of, ob);
352 e_widget_list_object_append(ol, of, 1, 0, 0.5);
353 e_widget_toolbook_page_append(otb, NULL, _("Pointer"), ol,
354 1, 0, 1, 0, 0.5, 0.0);
355
326 /* Misc */ 356 /* Misc */
327 ol = e_widget_list_add(evas, 0, 0); 357 ol = e_widget_list_add(evas, 0, 0);
328 of = e_widget_framelist_add(evas, _("Other Settings"), 0); 358 of = e_widget_framelist_add(evas, _("Other Settings"), 0);
@@ -341,20 +371,6 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da
341 ob = e_widget_check_add(evas, _("Focus last focused window on lost focus"), 371 ob = e_widget_check_add(evas, _("Focus last focused window on lost focus"),
342 &(cfdata->focus_revert_on_hide_or_close)); 372 &(cfdata->focus_revert_on_hide_or_close));
343 e_widget_framelist_object_append(of, ob); 373 e_widget_framelist_object_append(of, ob);
344 /* NOTE/TODO:
345 *
346 * IMHO all these slide-pointer-to-window, warp and all should have
347 * an unique and consistent setting. In some cases it just do not
348 * make sense to have one but not the other.
349 */
350
351 ob = e_widget_check_add(evas, _("Slide pointer to a new window which is focused"),
352 &(cfdata->pointer_slide));
353 e_widget_framelist_object_append(of, ob);
354
355 ob = e_widget_check_add(evas, _("Prevent all forms of pointer warping"),
356 &(cfdata->disable_all_pointer_warps));
357 e_widget_framelist_object_append(of, ob);
358 e_widget_list_object_append(ol, of, 1, 0, 0.5); 374 e_widget_list_object_append(ol, of, 1, 0, 0.5);
359 e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol, 375 e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol,
360 1, 0, 1, 0, 0.5, 0.0); 376 1, 0, 1, 0, 0.5, 0.0);
diff --git a/src/modules/winlist/e_int_config_winlist.c b/src/modules/winlist/e_int_config_winlist.c
index cf12fdf76..ca697068d 100644
--- a/src/modules/winlist/e_int_config_winlist.c
+++ b/src/modules/winlist/e_int_config_winlist.c
@@ -23,7 +23,6 @@ struct _E_Config_Dialog_Data
23 int warp_while_selecting; 23 int warp_while_selecting;
24 int warp_at_end; 24 int warp_at_end;
25 int no_warp_on_direction; 25 int no_warp_on_direction;
26 double warp_speed;
27 int jump_desk; 26 int jump_desk;
28 27
29 int scroll_animate; 28 int scroll_animate;
@@ -84,7 +83,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
84 cfdata->warp_while_selecting = e_config->winlist_warp_while_selecting; 83 cfdata->warp_while_selecting = e_config->winlist_warp_while_selecting;
85 cfdata->warp_at_end = e_config->winlist_warp_at_end; 84 cfdata->warp_at_end = e_config->winlist_warp_at_end;
86 cfdata->no_warp_on_direction = e_config->winlist_no_warp_on_direction; 85 cfdata->no_warp_on_direction = e_config->winlist_no_warp_on_direction;
87 cfdata->warp_speed = e_config->winlist_warp_speed;
88 86
89 cfdata->scroll_animate = e_config->winlist_scroll_animate; 87 cfdata->scroll_animate = e_config->winlist_scroll_animate;
90 cfdata->scroll_speed = e_config->winlist_scroll_speed; 88 cfdata->scroll_speed = e_config->winlist_scroll_speed;
@@ -133,7 +131,6 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
133 DO(warp_while_selecting, warp_while_selecting); 131 DO(warp_while_selecting, warp_while_selecting);
134 DO(warp_at_end, warp_at_end); 132 DO(warp_at_end, warp_at_end);
135 DO(no_warp_on_direction, no_warp_on_direction); 133 DO(no_warp_on_direction, no_warp_on_direction);
136 DO(warp_speed, warp_speed);
137 DO(scroll_animate, scroll_animate); 134 DO(scroll_animate, scroll_animate);
138 DO(scroll_speed, scroll_speed); 135 DO(scroll_speed, scroll_speed);
139 DO(list_focus_while_selecting, focus); 136 DO(list_focus_while_selecting, focus);
@@ -167,7 +164,6 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
167 DO(warp_while_selecting, warp_while_selecting); 164 DO(warp_while_selecting, warp_while_selecting);
168 DO(warp_at_end, warp_at_end); 165 DO(warp_at_end, warp_at_end);
169 DO(no_warp_on_direction, no_warp_on_direction); 166 DO(no_warp_on_direction, no_warp_on_direction);
170 DO(warp_speed, warp_speed);
171 DO(scroll_animate, scroll_animate); 167 DO(scroll_animate, scroll_animate);
172 DO(scroll_speed, scroll_speed); 168 DO(scroll_speed, scroll_speed);
173 DO(list_focus_while_selecting, focus); 169 DO(list_focus_while_selecting, focus);
@@ -239,14 +235,6 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
239 0, 0, 1, 0, 0.5, 0.0); 235 0, 0, 1, 0, 0.5, 0.0);
240 236
241 ol = e_widget_list_add(evas, 0, 0); 237 ol = e_widget_list_add(evas, 0, 0);
242 ob = e_widget_label_add(evas, _("Warp speed"));
243 cfdata->gui.disable_warp =
244 eina_list_append(cfdata->gui.disable_warp, ob);
245 e_widget_list_object_append(ol, ob, 1, 0, 0.0);
246 ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0,
247 &(cfdata->warp_speed), NULL, 100);
248 cfdata->gui.disable_warp = eina_list_append(cfdata->gui.disable_warp, ob);
249 e_widget_list_object_append(ol, ob, 1, 0, 0.0);
250 ob = e_widget_check_add(evas, _("Scroll Animation"), 238 ob = e_widget_check_add(evas, _("Scroll Animation"),
251 &(cfdata->scroll_animate)); 239 &(cfdata->scroll_animate));
252 e_widget_on_change_hook_set(ob, _scroll_animate_changed, cfdata); 240 e_widget_on_change_hook_set(ob, _scroll_animate_changed, cfdata);