disable move in pager for now. as it leads to lost window if one drops between the...

SVN revision: 42380

diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 8b93ccc..7c8d287 100644 (file)
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -163,14 +163,16 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_check_add(evas, _("Show desktop names"),
                            &(cfdata->show_desk_names));
    e_widget_frametable_object_append(of, ow, 0, 1, 2, 1, 1, 0, 1, 0);
-
+#if 0
+   /* FIXME: disable move in pager for now, as dropping in between
+      desks causes lost window */
    ow = e_widget_label_add(evas, _("Select and Slide button"));
    e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
    ow = e_widget_button_add(evas, _("Click to set"), NULL,
                             _grab_wnd_show, (void *)BUTTON_DRAG, cfdata);
    cfdata->gui.o_btn1 = ow;
    e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 0, 0, 1, 0);
-
+#endif
    ow = e_widget_label_add(evas, _("Drag and Drop button"));
    e_widget_frametable_object_append(of, ow, 0, 3, 1, 1, 1, 0, 1, 0);
    ow = e_widget_button_add(evas, _("Click to set"), NULL,
@@ -397,12 +399,12 @@ static void
 _adv_update_btn_lbl(E_Config_Dialog_Data *cfdata)
 {
    char lbl[256] = "";
-
+#if 0
    snprintf(lbl, sizeof(lbl), _("Click to set"));
    if (cfdata->btn.drag)
      snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.drag);
    e_widget_button_label_set(cfdata->gui.o_btn1, lbl);
-   
+#endif   
    snprintf(lbl, sizeof(lbl), _("Click to set"));
    if (cfdata->btn.noplace)
      snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.noplace);

diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 7be7169..9f95f06 100644 (file)
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -1776,9 +1776,15 @@ _pager_window_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_i
        pw->drag.dx = ox - ev->canvas.x;
        pw->drag.dy = oy - ev->canvas.y;
        pw->drag.start = 1;
-       pw->drag.no_place = 0;
        pw->drag.button = ev->button;
+#if 0
+       /* FIXME: disable move in pager for now, as dropping in between
+          desks causes lost window */
+       pw->drag.no_place = 0;
        if (ev->button == pager_config->btn_noplace) pw->drag.no_place = 1;
+#else
+       pw->drag.no_place = 1;
+#endif
      }
 }