summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_desk.c5
-rw-r--r--src/bin/e_desk.h2
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c3d3e41e0..758369b67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-05-14 Mike Blumenkrantz
2
3 * e_desk_last_focused now returns the border it wants to focus
4
12013-05-08 Mike Blumenkrantz 52013-05-08 Mike Blumenkrantz
2 6
3 * e_fm2_optimal_size_calc returns bool to indicate whether the returned size can be used 7 * e_fm2_optimal_size_calc returns bool to indicate whether the returned size can be used
diff --git a/NEWS b/NEWS
index b133d33f4..ec3753d2b 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,7 @@ Changes:
64 * deskpreview renamed to bgpreview 64 * deskpreview renamed to bgpreview
65 * e_widget_bgpreview_desk_add now takes an evas instead of an evas object 65 * e_widget_bgpreview_desk_add now takes an evas instead of an evas object
66 * e_fm2_optimal_size_calc returns bool to indicate whether the returned size can be used 66 * e_fm2_optimal_size_calc returns bool to indicate whether the returned size can be used
67 * e_desk_last_focus now returns the border it tries to apply focus to
67 Config: 68 Config:
68 * move winlist_warp_speed option to pointer_warp_speed 69 * move winlist_warp_speed option to pointer_warp_speed
69 * bindings now use new E_Binding_Event structs for mouse events 70 * bindings now use new E_Binding_Event structs for mouse events
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 417b83c76..4635ff1d4 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -369,7 +369,7 @@ e_desk_deskshow(E_Zone *zone)
369 _e_desk_event_desk_deskshow_free, NULL); 369 _e_desk_event_desk_deskshow_free, NULL);
370} 370}
371 371
372EAPI void 372EAPI E_Border *
373e_desk_last_focused_focus(E_Desk *desk) 373e_desk_last_focused_focus(E_Desk *desk)
374{ 374{
375 Eina_List *l = NULL; 375 Eina_List *l = NULL;
@@ -390,10 +390,11 @@ e_desk_last_focused_focus(E_Desk *desk)
390 if (!bd->lock_focus_out) 390 if (!bd->lock_focus_out)
391 { 391 {
392 e_border_focus_set_with_pointer(bd); 392 e_border_focus_set_with_pointer(bd);
393 break; 393 return bd;
394 } 394 }
395 } 395 }
396 } 396 }
397 return NULL;
397} 398}
398 399
399EAPI void 400EAPI void
diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 4c229f566..b8d06dc0c 100644
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -71,7 +71,7 @@ EAPI void e_desk_name_del(int container, int zone, int desk_x, int desk_
71EAPI void e_desk_name_update(void); 71EAPI void e_desk_name_update(void);
72EAPI void e_desk_show(E_Desk *desk); 72EAPI void e_desk_show(E_Desk *desk);
73EAPI void e_desk_deskshow(E_Zone *zone); 73EAPI void e_desk_deskshow(E_Zone *zone);
74EAPI void e_desk_last_focused_focus(E_Desk *desk); 74EAPI E_Border *e_desk_last_focused_focus(E_Desk *desk);
75EAPI E_Desk *e_desk_current_get(E_Zone *zone); 75EAPI E_Desk *e_desk_current_get(E_Zone *zone);
76EAPI E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y); 76EAPI E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y);
77EAPI E_Desk *e_desk_at_pos_get(E_Zone *zone, int pos); 77EAPI E_Desk *e_desk_at_pos_get(E_Zone *zone, int pos);