summaryrefslogtreecommitdiff
path: root/src/lib/efl
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-05 18:35:13 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-05 19:49:12 +0200
commitfc12e7721fd2ea2b39f9a732522e744d43a66840 (patch)
tree8ae44eafc4cf14f9a5e84f50026c6ede41f9e279 /src/lib/efl
parent53649030db9a46dd7a25a2cc41bc1d7d7a1b2460 (diff)
efl_ui_selectable: split this up
i dont know why, but something got badly mixed up, the selection APIs for text and item ended up in the same interface, which seems ... weird ? This commit splits that up into container_selectable and text_selectable, there is no future plan on my list for text_selection. The rest of this series is working towards removing container_selectable, replacing it with a new interface. However, the interface will stay until list_view is replaced. The changes in the legacy code are removing the efl.ui.selection interface from it, item emission is not depending on the inherited interfaces, additionally, this interface does not provide any API, so this should not be an issue. ref T7766 Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Differential Revision: https://phab.enlightenment.org/D9498
Diffstat (limited to '')
-rw-r--r--src/lib/efl/Efl.h3
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c3
-rw-r--r--src/lib/efl/interfaces/efl_ui_container_selectable.eo11
-rw-r--r--src/lib/efl/interfaces/efl_ui_text_selectable.eo (renamed from src/lib/efl/interfaces/efl_ui_selectable.eo)8
-rw-r--r--src/lib/efl/interfaces/meson.build3
5 files changed, 19 insertions, 9 deletions
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 97c21ec3fb..c1c934f6b0 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -107,7 +107,8 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
107#include "interfaces/efl_ui_scrollable.eo.h" 107#include "interfaces/efl_ui_scrollable.eo.h"
108#include "interfaces/efl_ui_scrollbar.eo.h" 108#include "interfaces/efl_ui_scrollbar.eo.h"
109#include "interfaces/efl_ui_scrollable_interactive.eo.h" 109#include "interfaces/efl_ui_scrollable_interactive.eo.h"
110#include "interfaces/efl_ui_selectable.eo.h" 110#include "interfaces/efl_ui_text_selectable.eo.h"
111#include "interfaces/efl_ui_container_selectable.eo.h"
111#include "interfaces/efl_ui_multi_selectable.eo.h" 112#include "interfaces/efl_ui_multi_selectable.eo.h"
112#include "interfaces/efl_ui_zoom.eo.h" 113#include "interfaces/efl_ui_zoom.eo.h"
113 114
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 0817211ffb..141a2904a7 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -75,7 +75,8 @@
75#include "interfaces/efl_ui_scrollable.eo.c" 75#include "interfaces/efl_ui_scrollable.eo.c"
76#include "interfaces/efl_ui_scrollable_interactive.eo.c" 76#include "interfaces/efl_ui_scrollable_interactive.eo.c"
77#include "interfaces/efl_ui_scrollbar.eo.c" 77#include "interfaces/efl_ui_scrollbar.eo.c"
78#include "interfaces/efl_ui_selectable.eo.c" 78#include "interfaces/efl_ui_container_selectable.eo.c"
79#include "interfaces/efl_ui_text_selectable.eo.c"
79#include "interfaces/efl_ui_multi_selectable.eo.c" 80#include "interfaces/efl_ui_multi_selectable.eo.c"
80#include "interfaces/efl_ui_zoom.eo.c" 81#include "interfaces/efl_ui_zoom.eo.c"
81 82
diff --git a/src/lib/efl/interfaces/efl_ui_container_selectable.eo b/src/lib/efl/interfaces/efl_ui_container_selectable.eo
new file mode 100644
index 0000000000..0d7fda5409
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_container_selectable.eo
@@ -0,0 +1,11 @@
1interface @beta Efl.Ui.Container_Selectable
2{
3 [[Temporare interface, this is here until collection_view lands]]
4 event_prefix: efl_ui;
5 events {
6 /* FIXME: Called with multiple types of event_info! */
7 item,selected: Efl.Object; [[Called when selected]]
8 /* FIXME: Called with multiple types of event_info! */
9 item,unselected: Efl.Object; [[Called when no longer selected]]
10 }
11}
diff --git a/src/lib/efl/interfaces/efl_ui_selectable.eo b/src/lib/efl/interfaces/efl_ui_text_selectable.eo
index 1105fe42d2..b5ad3bd67b 100644
--- a/src/lib/efl/interfaces/efl_ui_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_text_selectable.eo
@@ -1,12 +1,8 @@
1interface @beta Efl.Ui.Selectable 1interface @beta Efl.Ui.Text_Selectable
2{ 2{
3 [[Efl UI selectable interface]] 3 [[Efl UI text selectable interface]]
4 event_prefix: efl_ui; 4 event_prefix: efl_ui;
5 events { 5 events {
6 /* FIXME: Called with multiple types of event_info! */
7 item,selected: Efl.Object; [[Called when selected]]
8 /* FIXME: Called with multiple types of event_info! */
9 item,unselected: Efl.Object; [[Called when no longer selected]]
10 selection,paste: void; [[Called when selection is pasted]] 6 selection,paste: void; [[Called when selection is pasted]]
11 selection,copy: void; [[Called when selection is copied]] 7 selection,copy: void; [[Called when selection is copied]]
12 selection,cut: void; [[Called when selection is cut]] 8 selection,cut: void; [[Called when selection is cut]]
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index abfe721dac..7467882665 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -11,7 +11,8 @@ pub_legacy_eo_files = [
11 'efl_ui_scrollable.eo', 11 'efl_ui_scrollable.eo',
12 'efl_ui_scrollable_interactive.eo', 12 'efl_ui_scrollable_interactive.eo',
13 'efl_ui_scrollbar.eo', 13 'efl_ui_scrollbar.eo',
14 'efl_ui_selectable.eo', 14 'efl_ui_container_selectable.eo',
15 'efl_ui_text_selectable.eo',
15 'efl_ui_zoom.eo', 16 'efl_ui_zoom.eo',
16] 17]
17 18