summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-08-20 13:14:00 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-23 07:33:49 +0200
commit9d8735caf7274d2b731100d395535165f9731846 (patch)
tree1bcd4fec09bf1a1f4da6447180dabb822df72b95 /src/lib
parent1a517b4c2db78cf9666f3ffbb10ebb7903654308 (diff)
efl_ui/popup: remove scroll_alert class
this can now be done by simply calling efl_ui_widget_scrollable_content_set on an alert popup tests have been adjusted for this Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D9675
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/Efl_Ui.h1
-rw-r--r--src/lib/elementary/Elementary.h1
-rw-r--r--src/lib/elementary/efl_ui_popup.c96
-rw-r--r--src/lib/elementary/efl_ui_popup.eo2
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup.c257
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup.eo11
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup_part.eo10
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup_private.h13
-rw-r--r--src/lib/elementary/meson.build4
9 files changed, 54 insertions, 341 deletions
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index a77a95e333..b3c55b2f22 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -268,7 +268,6 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
268# include <efl_ui_multi_selectable.eo.h> 268# include <efl_ui_multi_selectable.eo.h>
269# include <efl_ui_popup.eo.h> 269# include <efl_ui_popup.eo.h>
270# include <efl_ui_alert_popup.eo.h> 270# include <efl_ui_alert_popup.eo.h>
271# include <efl_ui_scroll_alert_popup.eo.h>
272# include <efl_ui_text_alert_popup.eo.h> 271# include <efl_ui_text_alert_popup.eo.h>
273# include <efl_ui_popup_part_backwall.eo.h> 272# include <efl_ui_popup_part_backwall.eo.h>
274# include <efl_ui_grid.eo.h> 273# include <efl_ui_grid.eo.h>
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 0a4b321fa4..a5a8acfd71 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -311,7 +311,6 @@ typedef Eo Efl_Ui_Focus_Manager;
311# include <efl_ui_text.eo.h> 311# include <efl_ui_text.eo.h>
312# include <efl_ui_popup.eo.h> 312# include <efl_ui_popup.eo.h>
313# include <efl_ui_alert_popup.eo.h> 313# include <efl_ui_alert_popup.eo.h>
314# include <efl_ui_scroll_alert_popup.eo.h>
315# include <efl_ui_text_alert_popup.eo.h> 314# include <efl_ui_text_alert_popup.eo.h>
316# include <efl_ui_popup_part_backwall.eo.h> 315# include <efl_ui_popup_part_backwall.eo.h>
317# include <efl_ui_text_factory_images.eo.h> 316# include <efl_ui_text_factory_images.eo.h>
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index c29b3f2fc8..cb679d3a7c 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -5,7 +5,7 @@
5#define EFL_PART_PROTECTED 5#define EFL_PART_PROTECTED
6#define EFL_UI_POPUP_PROTECTED 6#define EFL_UI_POPUP_PROTECTED
7#define EFL_PART_PROTECTED 7#define EFL_PART_PROTECTED
8 8#define EFL_UI_WIDGET_SCROLLABLE_CONTENT_PROTECTED
9#include <Elementary.h> 9#include <Elementary.h>
10 10
11#include "elm_priv.h" 11#include "elm_priv.h"
@@ -479,6 +479,57 @@ _efl_ui_popup_timeout_get(const Eo *obj EINA_UNUSED, Efl_Ui_Popup_Data *pd)
479 return pd->timeout; 479 return pd->timeout;
480} 480}
481 481
482/* this will ONLY be called during _sizing_eval() */
483static void
484_scrollable_content_size_cb(void *data EINA_UNUSED, const Efl_Event *ev)
485{
486 Eina_Size2D *size = ev->info;
487
488 efl_gfx_entity_size_set(ev->object, *size);
489 /* finish group calc chain */
490 efl_canvas_group_calculate(efl_super(ev->object, EFL_UI_WIDGET_SCROLLABLE_CONTENT_MIXIN));
491}
492
493static void
494_sizing_eval(Eo *obj)
495{
496 Eina_Size2D min;
497
498 /* trigger layout calc */
499 efl_canvas_group_calculate(efl_super(obj, MY_CLASS));
500 if (efl_ui_widget_scrollable_content_did_group_calc_get(obj)) return;
501 min = efl_gfx_hint_size_combined_min_get(obj);
502
503 Eina_Size2D size = efl_gfx_entity_size_get(obj);
504
505 Eina_Size2D new_size;
506 new_size.w = (min.w > size.w ? min.w : size.w);
507 new_size.h = (min.h > size.h ? min.h : size.h);
508 efl_gfx_entity_size_set(obj, new_size);
509}
510
511EOLIAN static void
512_efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd)
513{
514 /* When efl_canvas_group_change() is called, just flag is set instead of size
515 * calculation.
516 * The actual size calculation is done here when the object is rendered to
517 * avoid duplicate size calculations. */
518 efl_canvas_group_need_recalculate_set(obj, EINA_FALSE);
519 pd->in_calc = EINA_TRUE;
520 _sizing_eval(obj);
521 pd->in_calc = EINA_FALSE;
522 if (pd->anchor)
523 _anchor_calc(obj);
524 else
525 _calc_align(obj);
526
527 Eina_Rect p_geom = efl_gfx_entity_geometry_get(pd->win_parent);
528
529 efl_gfx_entity_position_set(pd->backwall, EINA_POSITION2D(0, 0));
530 efl_gfx_entity_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
531}
532
482EOLIAN static Eo * 533EOLIAN static Eo *
483_efl_ui_popup_efl_object_constructor(Eo *obj, Efl_Ui_Popup_Data *pd) 534_efl_ui_popup_efl_object_constructor(Eo *obj, Efl_Ui_Popup_Data *pd)
484{ 535{
@@ -489,6 +540,7 @@ _efl_ui_popup_efl_object_constructor(Eo *obj, Efl_Ui_Popup_Data *pd)
489 obj = efl_constructor(efl_super(obj, MY_CLASS)); 540 obj = efl_constructor(efl_super(obj, MY_CLASS));
490 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 541 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
491 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _hints_changed_cb, pd); 542 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _hints_changed_cb, pd);
543 efl_event_callback_add(obj, EFL_UI_WIDGET_SCROLLABLE_CONTENT_EVENT_OPTIMAL_SIZE_CALC, _scrollable_content_size_cb, pd);
492 544
493 elm_widget_can_focus_set(obj, EINA_TRUE); 545 elm_widget_can_focus_set(obj, EINA_TRUE);
494 if (elm_widget_theme_object_set(obj, wd->resize_obj, 546 if (elm_widget_theme_object_set(obj, wd->resize_obj,
@@ -529,48 +581,6 @@ _efl_ui_popup_efl_object_destructor(Eo *obj, Efl_Ui_Popup_Data *pd)
529 efl_destructor(efl_super(obj, MY_CLASS)); 581 efl_destructor(efl_super(obj, MY_CLASS));
530} 582}
531 583
532static void
533_sizing_eval(Eo *obj)
534{
535 Eina_Size2D min;
536
537 /* trigger layout calc */
538 efl_canvas_group_calculate(efl_super(obj, MY_CLASS));
539 min = efl_gfx_hint_size_combined_min_get(obj);
540
541 Eina_Size2D size = efl_gfx_entity_size_get(obj);
542
543 Eina_Size2D new_size;
544 new_size.w = (min.w > size.w ? min.w : size.w);
545 new_size.h = (min.h > size.h ? min.h : size.h);
546 efl_gfx_entity_size_set(obj, new_size);
547}
548
549EOLIAN static void
550_efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd)
551{
552 /* When efl_canvas_group_change() is called, just flag is set instead of size
553 * calculation.
554 * The actual size calculation is done here when the object is rendered to
555 * avoid duplicate size calculations. */
556 efl_canvas_group_need_recalculate_set(obj, EINA_FALSE);
557 if (!pd->in_calc)
558 {
559 pd->in_calc = EINA_TRUE;
560 _sizing_eval(obj);
561 pd->in_calc = EINA_FALSE;
562 }
563 if (pd->anchor)
564 _anchor_calc(obj);
565 else
566 _calc_align(obj);
567
568 Eina_Rect p_geom = efl_gfx_entity_geometry_get(pd->win_parent);
569
570 efl_gfx_entity_position_set(pd->backwall, EINA_POSITION2D(0, 0));
571 efl_gfx_entity_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
572}
573
574/* Standard widget overrides */ 584/* Standard widget overrides */
575 585
576ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_popup, Efl_Ui_Popup_Data) 586ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_popup, Efl_Ui_Popup_Data)
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index 15dde23413..7cd8fdf0a1 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -8,7 +8,7 @@ enum @beta Efl.Ui.Popup_Align {
8 bottom [[Popup aligned to bottom]] 8 bottom [[Popup aligned to bottom]]
9} 9}
10 10
11class @beta Efl.Ui.Popup extends Efl.Ui.Layout_Base implements Efl.Content, Efl.Ui.Focus.Layer 11class @beta Efl.Ui.Popup extends Efl.Ui.Layout_Base implements Efl.Content, Efl.Ui.Focus.Layer, Efl.Ui.Widget.Scrollable_Content
12{ 12{
13 [[EFL UI popup class]] 13 [[EFL UI popup class]]
14 methods { 14 methods {
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c
deleted file mode 100644
index 6bc43e2c1e..0000000000
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.c
+++ /dev/null
@@ -1,257 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h"
3#endif
4
5#define EFL_PART_PROTECTED
6
7#include <Elementary.h>
8
9#include "elm_priv.h"
10#include "efl_ui_popup_private.h"
11#include "efl_ui_scroll_alert_popup_private.h"
12#include "efl_ui_scroll_alert_popup_part.eo.h"
13#include "elm_part_helper.h"
14
15#define MY_CLASS EFL_UI_SCROLL_ALERT_POPUP_CLASS
16#define MY_CLASS_NAME "Efl.Ui.Scroll_Alert_Popup"
17
18static void
19_scroller_sizing_eval(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd,
20 Eina_Size2D obj_min, Eina_Size2D scr_min)
21{
22 Eina_Size2D max_size, min_size;
23 max_size = efl_gfx_hint_size_max_get(obj);
24
25 if (max_size.w != -1)
26 max_size.w = (obj_min.w > max_size.w) ? obj_min.w : max_size.w;
27 if (max_size.h != -1)
28 max_size.h = (obj_min.h > max_size.h) ? obj_min.h : max_size.h;
29
30 min_size = efl_gfx_hint_size_min_get(obj);
31
32 Eina_Size2D size;
33 size.w = (obj_min.w > min_size.w) ? obj_min.w : min_size.w;
34 size.h = (obj_min.h > min_size.h) ? obj_min.h : min_size.h;
35
36 Eina_Size2D new_min = obj_min;
37
38 if ((max_size.w == -1) && (max_size.h == -1))
39 {
40 efl_ui_scrollable_match_content_set(pd->scroller, EINA_FALSE, EINA_FALSE);
41 efl_gfx_entity_size_set(obj, size);
42 }
43 else if ((max_size.w == -1) && (max_size.h != -1))
44 {
45 if (max_size.h < scr_min.h)
46 {
47 efl_ui_scrollable_match_content_set(pd->scroller, EINA_FALSE, EINA_FALSE);
48 efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, max_size.h));
49 }
50 else
51 {
52 new_min.h = scr_min.h;
53 efl_ui_scrollable_match_content_set(pd->scroller, EINA_FALSE, EINA_TRUE);
54 efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, scr_min.h));
55 }
56 }
57 else if ((max_size.w != -1) && (max_size.h == -1))
58 {
59 if (max_size.w < scr_min.w)
60 {
61 efl_ui_scrollable_match_content_set(pd->scroller, EINA_FALSE, EINA_FALSE);
62 efl_gfx_entity_size_set(obj, EINA_SIZE2D(max_size.w, size.h));
63 }
64 else
65 {
66 new_min.w = scr_min.w;
67 efl_ui_scrollable_match_content_set(pd->scroller, EINA_TRUE, EINA_FALSE);
68 efl_gfx_entity_size_set(obj, EINA_SIZE2D(scr_min.w, size.h));
69 }
70 }
71 else if ((max_size.w != -1) && (max_size.h != -1))
72 {
73 Eina_Size2D new_size;
74 Eina_Bool min_limit_w = EINA_FALSE;
75 Eina_Bool min_limit_h = EINA_FALSE;
76
77 if (max_size.w < scr_min.w)
78 {
79 new_size.w = max_size.w;
80 }
81 else
82 {
83 min_limit_w = EINA_TRUE;
84 new_min.w = scr_min.w;
85 new_size.w = scr_min.w;
86 }
87
88 if (max_size.h < scr_min.h)
89 {
90 new_size.h = max_size.h;
91 }
92 else
93 {
94 min_limit_h = EINA_TRUE;
95 new_min.h = scr_min.h;
96 new_size.h = scr_min.h;
97 }
98
99 efl_ui_scrollable_match_content_set(pd->scroller, min_limit_w, min_limit_h);
100 efl_gfx_entity_size_set(obj, new_size);
101 }
102 efl_canvas_group_calculate(pd->scroller);
103
104 efl_gfx_hint_size_restricted_min_set(obj, new_min);
105}
106
107static void
108_sizing_eval(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd)
109{
110 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
111 Evas_Coord obj_minw = -1, obj_minh = -1;
112 Evas_Coord scr_minw = -1, scr_minh = -1;
113
114 //Calculate popup's min size including scroller's min size
115 {
116 efl_ui_scrollable_match_content_set(pd->scroller, EINA_TRUE, EINA_TRUE);
117 efl_canvas_group_calculate(pd->scroller);
118
119 elm_coords_finger_size_adjust(1, &scr_minw, 1, &scr_minh);
120 edje_object_size_min_restricted_calc
121 (wd->resize_obj, &scr_minw, &scr_minh, scr_minw, scr_minh);
122 }
123
124 //Calculate popup's min size except scroller's min size
125 {
126 efl_ui_scrollable_match_content_set(pd->scroller, EINA_FALSE, EINA_FALSE);
127 efl_canvas_group_calculate(pd->scroller);
128
129 elm_coords_finger_size_adjust(1, &obj_minw, 1, &obj_minh);
130 edje_object_size_min_restricted_calc
131 (wd->resize_obj, &obj_minw, &obj_minh, obj_minw, obj_minh);
132 }
133 _scroller_sizing_eval(obj, pd, EINA_SIZE2D(obj_minw, obj_minh), EINA_SIZE2D(scr_minw, scr_minh));
134}
135
136EOLIAN static void
137_efl_ui_scroll_alert_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd)
138{
139 EFL_UI_POPUP_DATA_GET_OR_RETURN(obj, ppd);
140 ppd->in_calc = EINA_TRUE;
141
142 _sizing_eval(obj, pd);
143 efl_canvas_group_need_recalculate_set(pd->scroller, EINA_FALSE);
144 efl_canvas_group_need_recalculate_set(obj, EINA_FALSE);
145
146 //Not to calculate size by super class
147 efl_canvas_group_calculate(efl_super(obj, MY_CLASS));
148 ppd->in_calc = EINA_FALSE;
149}
150
151static Eina_Bool
152_efl_ui_scroll_alert_popup_content_set(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd, const char *part, Eo *content)
153{
154 //For efl_content_set()
155 if (part && !strcmp(part, "efl.content"))
156 {
157 pd->content = content;
158
159 //Content should have expand propeties since the scroller is not layout layer
160 efl_gfx_hint_weight_set(pd->content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
161 efl_gfx_hint_fill_set(pd->content, EINA_TRUE, EINA_TRUE);
162
163 efl_content_set(pd->scroller, pd->content);
164 }
165 else
166 {
167 efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
168 }
169
170 return EINA_TRUE;
171}
172
173Eo *
174_efl_ui_scroll_alert_popup_content_get(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd, const char *part)
175{
176 //For efl_content_set()
177 if (part && !strcmp(part, "efl.content"))
178 return pd->content;
179
180 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
181}
182
183static Eo *
184_efl_ui_scroll_alert_popup_content_unset(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd, const char *part)
185{
186 //For efl_content_set()
187 if (part && !strcmp(part, "efl.content"))
188 {
189 Eo *content = pd->content;
190 if (!content) return content;
191
192 pd->content = NULL;
193
194 return efl_content_unset(pd->scroller);
195 }
196
197 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
198}
199
200static Eina_Bool
201_efl_ui_scroll_alert_popup_text_set(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd EINA_UNUSED, const char *part, const char *label)
202{
203 efl_text_set(efl_part(efl_super(obj, MY_CLASS), part), label);
204
205 return EINA_TRUE;
206}
207
208const char *
209_efl_ui_scroll_alert_popup_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Scroll_Alert_Popup_Data *pd EINA_UNUSED, const char *part)
210{
211 return efl_text_get(efl_part(efl_super(obj, MY_CLASS), part));
212}
213
214EOLIAN static Eo *
215_efl_ui_scroll_alert_popup_efl_object_constructor(Eo *obj,
216 Efl_Ui_Scroll_Alert_Popup_Data *pd)
217{
218 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
219
220 if (!elm_widget_theme_klass_get(obj))
221 elm_widget_theme_klass_set(obj, "scroll_alert_popup");
222 obj = efl_constructor(efl_super(obj, MY_CLASS));
223 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
224
225 pd->scroller = efl_add(EFL_UI_SCROLLER_CLASS, obj,
226 efl_ui_widget_style_set(efl_added, "popup/no_inset_shadow"),
227 efl_ui_scrollbar_bar_mode_set(efl_added, EFL_UI_SCROLLBAR_MODE_AUTO, EFL_UI_SCROLLBAR_MODE_AUTO));
228
229 efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.content"),
230 pd->scroller);
231
232 return obj;
233}
234
235/* Efl.Part begin */
236
237static Eina_Bool
238_part_is_efl_ui_scroll_alert_popup_part(const Eo *obj EINA_UNUSED, const char *part)
239{
240 //Use Efl.Ui.Widget's "background" and "shadow" parts
241 if (eina_streq(part, "background") || eina_streq(part, "shadow"))
242 return EINA_FALSE;
243
244 return EINA_TRUE;
245}
246
247ELM_PART_OVERRIDE_PARTIAL(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data, _part_is_efl_ui_scroll_alert_popup_part)
248ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data)
249ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data)
250ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data)
251ELM_PART_OVERRIDE_TEXT_SET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data)
252ELM_PART_OVERRIDE_TEXT_GET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data)
253#include "efl_ui_scroll_alert_popup_part.eo.c"
254
255/* Efl.Part end */
256
257#include "efl_ui_scroll_alert_popup.eo.c"
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.eo b/src/lib/elementary/efl_ui_scroll_alert_popup.eo
deleted file mode 100644
index 709ff55004..0000000000
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.eo
+++ /dev/null
@@ -1,11 +0,0 @@
1import eina_types;
2
3class @beta Efl.Ui.Scroll_Alert_Popup extends Efl.Ui.Alert_Popup
4{
5 [[EFL UI Scroll Alert Popup class]]
6 implements {
7 Efl.Object.constructor;
8 Efl.Canvas.Group.group_calculate;
9 Efl.Part.part_get;
10 }
11}
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo b/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo
deleted file mode 100644
index b9a818a00f..0000000000
--- a/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo
+++ /dev/null
@@ -1,10 +0,0 @@
1class @beta Efl.Ui.Scroll_Alert_Popup_Part extends Efl.Ui.Layout_Part implements Efl.Content, Efl.Text
2{
3 [[Efl UI Scroll Alert Popup internal part class]]
4 data: null;
5 implements {
6 Efl.Content.content { get; set; }
7 Efl.Content.content_unset;
8 Efl.Text.text { set; get; }
9 }
10}
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup_private.h b/src/lib/elementary/efl_ui_scroll_alert_popup_private.h
deleted file mode 100644
index 2fe522a86b..0000000000
--- a/src/lib/elementary/efl_ui_scroll_alert_popup_private.h
+++ /dev/null
@@ -1,13 +0,0 @@
1#ifndef EFL_UI_SCROLL_ALERT_POPUP_H
2#define EFL_UI_SCROLL_ALERT_POPUP_H
3
4#include "Elementary.h"
5
6typedef struct _Efl_Ui_Scroll_Alert_Popup_Data Efl_Ui_Scroll_Alert_Popup_Data;
7struct _Efl_Ui_Scroll_Alert_Popup_Data
8{
9 Eo *scroller;
10 Eo *content;
11};
12
13#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 536f00bbde..6dd9cd99ee 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -84,8 +84,6 @@ pub_eo_files = [
84 'efl_ui_popup_part_backwall.eo', 84 'efl_ui_popup_part_backwall.eo',
85 'efl_ui_alert_popup.eo', 85 'efl_ui_alert_popup.eo',
86 'efl_ui_alert_popup_part.eo', 86 'efl_ui_alert_popup_part.eo',
87 'efl_ui_scroll_alert_popup.eo',
88 'efl_ui_scroll_alert_popup_part.eo',
89 'efl_ui_text_alert_popup.eo', 87 'efl_ui_text_alert_popup.eo',
90 'efl_ui_text_alert_popup_part.eo', 88 'efl_ui_text_alert_popup_part.eo',
91 'efl_ui_text_editable.eo', 89 'efl_ui_text_editable.eo',
@@ -310,7 +308,6 @@ elementary_headers_unstable = [
310 'efl_ui_widget_image.h', 308 'efl_ui_widget_image.h',
311 'efl_ui_popup_private.h', 309 'efl_ui_popup_private.h',
312 'efl_ui_alert_popup_private.h', 310 'efl_ui_alert_popup_private.h',
313 'efl_ui_scroll_alert_popup_private.h',
314 'efl_ui_text_alert_popup_private.h', 311 'efl_ui_text_alert_popup_private.h',
315 'elm_widget_index.h', 312 'elm_widget_index.h',
316 'elm_widget_inwin.h', 313 'elm_widget_inwin.h',
@@ -871,7 +868,6 @@ elementary_src = [
871 'efl_ui_box_private.h', 868 'efl_ui_box_private.h',
872 'efl_ui_popup.c', 869 'efl_ui_popup.c',
873 'efl_ui_alert_popup.c', 870 'efl_ui_alert_popup.c',
874 'efl_ui_scroll_alert_popup.c',
875 'efl_ui_text_alert_popup.c', 871 'efl_ui_text_alert_popup.c',
876 'efl_ui_table.c', 872 'efl_ui_table.c',
877 'efl_ui_table_static.c', 873 'efl_ui_table_static.c',