summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2015-01-05 12:24:19 +0100
committerDave Andreoli <dave@gurumeditation.it>2015-01-05 12:24:19 +0100
commitde01f76650c06b40b85444d8c4f75a85362c79f5 (patch)
treec758f93a83ef6c5205707b449d08acd15f3782c1
parent9b52817069b04fcd5811d2c5d77aa8fd422d44fd (diff)
Evas: better define for EVAS_HINT_FILL/EXPAND
Also added the various tuple we always use, just for convenience. Use the new tuples in the elm examples
-rw-r--r--efl/evas/efl.evas.pyx12
-rwxr-xr-xexamples/elementary/test.py4
-rw-r--r--examples/elementary/test_3d.py6
-rw-r--r--examples/elementary/test_access.py4
-rw-r--r--examples/elementary/test_actionslider.py6
-rw-r--r--examples/elementary/test_bg.py4
-rw-r--r--examples/elementary/test_box.py4
-rw-r--r--examples/elementary/test_bubble.py4
-rw-r--r--examples/elementary/test_button.py3
-rw-r--r--examples/elementary/test_calendar.py4
-rw-r--r--examples/elementary/test_check.py5
-rw-r--r--examples/elementary/test_clock.py3
-rw-r--r--examples/elementary/test_cnp.py5
-rw-r--r--examples/elementary/test_colorselector.py6
-rw-r--r--examples/elementary/test_config.py12
-rw-r--r--examples/elementary/test_conform.py7
-rw-r--r--examples/elementary/test_core_evas_canvas_callbacks.py4
-rw-r--r--examples/elementary/test_core_evas_object_callbacks.py4
-rw-r--r--examples/elementary/test_core_evas_smart.py5
-rw-r--r--examples/elementary/test_ctxpopup.py5
-rw-r--r--examples/elementary/test_cursor.py7
-rw-r--r--examples/elementary/test_datetime.py6
-rw-r--r--examples/elementary/test_dayselector.py6
-rw-r--r--examples/elementary/test_diskselector.py6
-rw-r--r--examples/elementary/test_dnd.py4
-rw-r--r--examples/elementary/test_entry.py7
-rw-r--r--examples/elementary/test_external.py4
-rw-r--r--examples/elementary/test_fileselector.py5
-rw-r--r--examples/elementary/test_fileselector_button.py4
-rw-r--r--examples/elementary/test_fileselector_entry.py5
-rw-r--r--examples/elementary/test_flip.py6
-rw-r--r--examples/elementary/test_flipselector.py4
-rw-r--r--examples/elementary/test_floating.py4
-rw-r--r--examples/elementary/test_focus.py7
-rw-r--r--examples/elementary/test_frame.py4
-rw-r--r--examples/elementary/test_gengrid.py7
-rw-r--r--examples/elementary/test_genlist.py5
-rw-r--r--examples/elementary/test_gesture_layer.py5
-rw-r--r--examples/elementary/test_grid.py3
-rw-r--r--examples/elementary/test_hover.py4
-rw-r--r--examples/elementary/test_hoversel.py3
-rw-r--r--examples/elementary/test_icon.py7
-rw-r--r--examples/elementary/test_image.py4
-rw-r--r--examples/elementary/test_index.py6
-rw-r--r--examples/elementary/test_input_events.py4
-rw-r--r--examples/elementary/test_label.py7
-rw-r--r--examples/elementary/test_layout.py3
-rw-r--r--examples/elementary/test_list.py7
-rw-r--r--examples/elementary/test_map.py8
-rw-r--r--examples/elementary/test_mapbuf.py7
-rw-r--r--examples/elementary/test_menu.py4
-rw-r--r--examples/elementary/test_multibuttonentry.py7
-rw-r--r--examples/elementary/test_naviframe.py4
-rw-r--r--examples/elementary/test_notify.py4
-rw-r--r--examples/elementary/test_panel.py6
-rw-r--r--examples/elementary/test_panel_scroll.py7
-rw-r--r--examples/elementary/test_panes.py4
-rw-r--r--examples/elementary/test_photo.py7
-rw-r--r--examples/elementary/test_photocam.py5
-rw-r--r--examples/elementary/test_popup.py5
-rw-r--r--examples/elementary/test_progressbar.py6
-rw-r--r--examples/elementary/test_radio.py5
-rw-r--r--examples/elementary/test_scroller.py7
-rw-r--r--examples/elementary/test_segment_control.py7
-rw-r--r--examples/elementary/test_separator.py3
-rw-r--r--examples/elementary/test_slider.py11
-rw-r--r--examples/elementary/test_slideshow.py7
-rw-r--r--examples/elementary/test_spinner.py7
-rw-r--r--examples/elementary/test_sys_notify.py8
-rw-r--r--examples/elementary/test_table.py6
-rw-r--r--examples/elementary/test_thumb.py4
-rw-r--r--examples/elementary/test_toolbar.py4
-rw-r--r--examples/elementary/test_tooltip.py7
-rw-r--r--examples/elementary/test_transit.py4
-rw-r--r--examples/elementary/test_video.py4
-rw-r--r--examples/elementary/test_web.py8
-rw-r--r--examples/elementary/test_win.py7
-rw-r--r--examples/elementary/test_win_dialog.py4
-rw-r--r--include/efl.evas.pxd7
79 files changed, 137 insertions, 298 deletions
diff --git a/efl/evas/efl.evas.pyx b/efl/evas/efl.evas.pyx
index 2544a63..8cd5321 100644
--- a/efl/evas/efl.evas.pyx
+++ b/efl/evas/efl.evas.pyx
@@ -22,6 +22,18 @@ from efl.utils.logger cimport add_logger
22cdef int PY_EFL_EVAS_LOG_DOMAIN = add_logger(__name__).eina_log_domain 22cdef int PY_EFL_EVAS_LOG_DOMAIN = add_logger(__name__).eina_log_domain
23 23
24 24
25# TODO doc
26EVAS_HINT_FILL = -1.0
27EVAS_HINT_EXPAND = 1.0
28
29EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
30EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
31EXPAND_VERT = 0.0, EVAS_HINT_EXPAND
32FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
33FILL_HORIZ = EVAS_HINT_FILL, 0.5
34FILL_VERT = 0.5, EVAS_HINT_FILL
35
36
25def init(): 37def init():
26 EINA_LOG_DOM_INFO(PY_EFL_EVAS_LOG_DOMAIN, "Initializing efl.evas", NULL) 38 EINA_LOG_DOM_INFO(PY_EFL_EVAS_LOG_DOMAIN, "Initializing efl.evas", NULL)
27 # when changing these, also change __init__.py! 39 # when changing these, also change __init__.py!
diff --git a/examples/elementary/test.py b/examples/elementary/test.py
index 777f4e1..46a110d 100755
--- a/examples/elementary/test.py
+++ b/examples/elementary/test.py
@@ -19,7 +19,7 @@ eolog.setLevel(logging.INFO)
19evaslog = logging.getLogger("efl.evas") 19evaslog = logging.getLogger("efl.evas")
20evaslog.setLevel(logging.INFO) 20evaslog.setLevel(logging.INFO)
21 21
22from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 22from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
23from efl import elementary 23from efl import elementary
24from efl.elementary.window import StandardWindow 24from efl.elementary.window import StandardWindow
25from efl.elementary.box import Box, ELM_BOX_LAYOUT_FLOW_HORIZONTAL 25from efl.elementary.box import Box, ELM_BOX_LAYOUT_FLOW_HORIZONTAL
@@ -35,8 +35,6 @@ elm_conf = Configuration()
35 35
36elog.setLevel(logging.DEBUG) 36elog.setLevel(logging.DEBUG)
37 37
38EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
39FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
40 38
41items = [ 39items = [
42 ("Core Libs", [ 40 ("Core Libs", [
diff --git a/examples/elementary/test_3d.py b/examples/elementary/test_3d.py
index 934a08c..2e7b303 100644
--- a/examples/elementary/test_3d.py
+++ b/examples/elementary/test_3d.py
@@ -3,15 +3,13 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, Image, Map 6from efl.evas import Image, Map, EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, FILL_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 10from efl.elementary.box import Box
10from efl.elementary.slider import Slider 11from efl.elementary.slider import Slider
11 12
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
14FILL_HORIZ = EVAS_HINT_FILL, 0.5
15 13
16img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images") 14img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images")
17ic_file = os.path.join(img_path, "rock_02.jpg") 15ic_file = os.path.join(img_path, "rock_02.jpg")
diff --git a/examples/elementary/test_access.py b/examples/elementary/test_access.py
index 1ca0b15..88b3e90 100644
--- a/examples/elementary/test_access.py
+++ b/examples/elementary/test_access.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_FILL, EVAS_HINT_EXPAND, \ 6from efl.evas import EVAS_HINT_FILL, EVAS_HINT_EXPAND, EXPAND_BOTH, FILL_BOTH, \
7 EVAS_ASPECT_CONTROL_VERTICAL 7 EVAS_ASPECT_CONTROL_VERTICAL
8from efl import elementary 8from efl import elementary
9from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
@@ -19,8 +19,6 @@ from efl.elementary.label import Label
19from efl.elementary.list import List 19from efl.elementary.list import List
20from efl.elementary.icon import Icon 20from efl.elementary.icon import Icon
21 21
22EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
23FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
24 22
25config = Configuration() 23config = Configuration()
26 24
diff --git a/examples/elementary/test_actionslider.py b/examples/elementary/test_actionslider.py
index 8ba45da..5a9a0cf 100644
--- a/examples/elementary/test_actionslider.py
+++ b/examples/elementary/test_actionslider.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
5 EXPAND_BOTH, EXPAND_HORIZ, FILL_BOTH
5from efl import elementary 6from efl import elementary
6from efl.elementary.actionslider import Actionslider, ELM_ACTIONSLIDER_NONE, \ 7from efl.elementary.actionslider import Actionslider, ELM_ACTIONSLIDER_NONE, \
7 ELM_ACTIONSLIDER_ALL, ELM_ACTIONSLIDER_LEFT, ELM_ACTIONSLIDER_CENTER, \ 8 ELM_ACTIONSLIDER_ALL, ELM_ACTIONSLIDER_LEFT, ELM_ACTIONSLIDER_CENTER, \
@@ -9,9 +10,6 @@ from efl.elementary.actionslider import Actionslider, ELM_ACTIONSLIDER_NONE, \
9from efl.elementary.box import Box 10from efl.elementary.box import Box
10from efl.elementary.window import StandardWindow 11from efl.elementary.window import StandardWindow
11 12
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
14FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
15 13
16positions = { 14positions = {
17 ELM_ACTIONSLIDER_NONE: "none", 15 ELM_ACTIONSLIDER_NONE: "none",
diff --git a/examples/elementary/test_bg.py b/examples/elementary/test_bg.py
index 3167726..35e5962 100644
--- a/examples/elementary/test_bg.py
+++ b/examples/elementary/test_bg.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow, Window, ELM_WIN_BASIC 8from efl.elementary.window import StandardWindow, Window, ELM_WIN_BASIC
9from efl.elementary.background import Background, ELM_BG_OPTION_SCALE 9from efl.elementary.background import Background, ELM_BG_OPTION_SCALE
@@ -12,8 +12,6 @@ from efl.elementary.frame import Frame
12from efl.elementary.label import Label 12from efl.elementary.label import Label
13from efl.elementary.list import List 13from efl.elementary.list import List
14 14
15EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17 15
18img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images") 16img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images")
19ic_file = os.path.join(img_path, "plant_01.jpg") 17ic_file = os.path.join(img_path, "plant_01.jpg")
diff --git a/examples/elementary/test_box.py b/examples/elementary/test_box.py
index 9f0ea30..dfc9048 100644
--- a/examples/elementary/test_box.py
+++ b/examples/elementary/test_box.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box, ELM_BOX_LAYOUT_HORIZONTAL 9from efl.elementary.box import Box, ELM_BOX_LAYOUT_HORIZONTAL
@@ -14,8 +14,6 @@ from efl.elementary.list import List
14from efl.elementary.icon import Icon 14from efl.elementary.icon import Icon
15from efl.elementary.separator import Separator 15from efl.elementary.separator import Separator
16 16
17EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
18FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
19 17
20img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images") 18img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images")
21ic_file = os.path.join(img_path, "logo_small.png") 19ic_file = os.path.join(img_path, "logo_small.png")
diff --git a/examples/elementary/test_bubble.py b/examples/elementary/test_bubble.py
index 89fec4b..35c5b0a 100644
--- a/examples/elementary/test_bubble.py
+++ b/examples/elementary/test_bubble.py
@@ -4,7 +4,7 @@
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EVAS_ASPECT_CONTROL_VERTICAL 7 EVAS_ASPECT_CONTROL_VERTICAL, EXPAND_BOTH, FILL_BOTH
8from efl import elementary 8from efl import elementary
9from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
10from efl.elementary.box import Box 10from efl.elementary.box import Box
@@ -16,8 +16,6 @@ from efl.elementary.bubble import Bubble, ELM_BUBBLE_POS_TOP_LEFT, \
16 ELM_BUBBLE_POS_TOP_RIGHT, ELM_BUBBLE_POS_BOTTOM_LEFT, \ 16 ELM_BUBBLE_POS_TOP_RIGHT, ELM_BUBBLE_POS_BOTTOM_LEFT, \
17 ELM_BUBBLE_POS_BOTTOM_RIGHT 17 ELM_BUBBLE_POS_BOTTOM_RIGHT
18 18
19EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
20FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
21 19
22img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images") 20img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images")
23ic_file = os.path.join(img_path, "logo_small.png") 21ic_file = os.path.join(img_path, "logo_small.png")
diff --git a/examples/elementary/test_button.py b/examples/elementary/test_button.py
index 7e719fc..c2c0536 100644
--- a/examples/elementary/test_button.py
+++ b/examples/elementary/test_button.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_ASPECT_CONTROL_VERTICAL 6from efl.evas import EVAS_HINT_EXPAND, EXPAND_BOTH,EVAS_ASPECT_CONTROL_VERTICAL
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 9from efl.elementary.box import Box
@@ -11,7 +11,6 @@ from efl.elementary.frame import Frame
11from efl.elementary.icon import Icon 11from efl.elementary.icon import Icon
12from efl.elementary.button import Button 12from efl.elementary.button import Button
13 13
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15 14
16img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images") 15img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images")
17ic_file = os.path.join(img_path, "logo_small.png") 16ic_file = os.path.join(img_path, "logo_small.png")
diff --git a/examples/elementary/test_calendar.py b/examples/elementary/test_calendar.py
index f976d01..6727b79 100644
--- a/examples/elementary/test_calendar.py
+++ b/examples/elementary/test_calendar.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
@@ -18,8 +18,6 @@ from efl.elementary.entry import Entry
18 18
19from datetime import datetime, timedelta 19from datetime import datetime, timedelta
20 20
21EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
22FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
23 21
24api = { 22api = {
25 "state" : 0, # What state we are testing 23 "state" : 0, # What state we are testing
diff --git a/examples/elementary/test_check.py b/examples/elementary/test_check.py
index e172134..5b54b7e 100644
--- a/examples/elementary/test_check.py
+++ b/examples/elementary/test_check.py
@@ -4,16 +4,13 @@
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EVAS_ASPECT_CONTROL_VERTICAL 7 EVAS_ASPECT_CONTROL_VERTICAL, EXPAND_BOTH, FILL_BOTH, FILL_HORIZ
8from efl import elementary 8from efl import elementary
9from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
10from efl.elementary.box import Box 10from efl.elementary.box import Box
11from efl.elementary.icon import Icon 11from efl.elementary.icon import Icon
12from efl.elementary.check import Check 12from efl.elementary.check import Check
13 13
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
16FILL_HORIZ = EVAS_HINT_FILL, 0.5
17 14
18img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images") 15img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "images")
19ic_file = os.path.join(img_path, "logo_small.png") 16ic_file = os.path.join(img_path, "logo_small.png")
diff --git a/examples/elementary/test_clock.py b/examples/elementary/test_clock.py
index a1425f1..7361ffa 100644
--- a/examples/elementary/test_clock.py
+++ b/examples/elementary/test_clock.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND 4from efl.evas import EVAS_HINT_EXPAND, EXPAND_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
@@ -9,7 +9,6 @@ from efl.elementary.check import Check
9from efl.elementary.clock import Clock, ELM_CLOCK_EDIT_HOUR_DECIMAL, \ 9from efl.elementary.clock import Clock, ELM_CLOCK_EDIT_HOUR_DECIMAL, \
10 ELM_CLOCK_EDIT_MIN_DECIMAL, ELM_CLOCK_EDIT_SEC_DECIMAL 10 ELM_CLOCK_EDIT_MIN_DECIMAL, ELM_CLOCK_EDIT_SEC_DECIMAL
11 11
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13 12
14def pause_changed_cb(ck, widgets): 13def pause_changed_cb(ck, widgets):
15 for w in widgets: 14 for w in widgets:
diff --git a/examples/elementary/test_cnp.py b/examples/elementary/test_cnp.py
index 3aa7533..01ee024 100644
--- a/examples/elementary/test_cnp.py
+++ b/examples/elementary/test_cnp.py
@@ -1,6 +1,5 @@
1from efl import elementary 1from efl import elementary
2from efl.evas import EVAS_HINT_FILL, EVAS_HINT_EXPAND 2from efl.evas import EVAS_HINT_FILL, EVAS_HINT_EXPAND, EXPAND_BOTH, FILL_BOTH
3
4from efl.elementary.window import StandardWindow 3from efl.elementary.window import StandardWindow
5from efl.elementary.label import Label 4from efl.elementary.label import Label
6from efl.elementary.entry import Entry, ELM_WRAP_CHAR 5from efl.elementary.entry import Entry, ELM_WRAP_CHAR
@@ -8,8 +7,6 @@ from efl.elementary.grid import Grid
8from efl.elementary.button import Button 7from efl.elementary.button import Button
9from efl.elementary.object import ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT 8from efl.elementary.object import ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT
10 9
11EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
12FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
13 10
14def bt_copy_clicked(obj, data): 11def bt_copy_clicked(obj, data):
15 en = data 12 en = data
diff --git a/examples/elementary/test_colorselector.py b/examples/elementary/test_colorselector.py
index becc14c..ef03bf9 100644
--- a/examples/elementary/test_colorselector.py
+++ b/examples/elementary/test_colorselector.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, Rectangle 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, Rectangle, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 8from efl.elementary.box import Box
@@ -11,9 +12,6 @@ from efl.elementary.colorselector import Colorselector, \
11 ELM_COLORSELECTOR_PALETTE, ELM_COLORSELECTOR_COMPONENTS, \ 12 ELM_COLORSELECTOR_PALETTE, ELM_COLORSELECTOR_COMPONENTS, \
12 ELM_COLORSELECTOR_BOTH 13 ELM_COLORSELECTOR_BOTH
13 14
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17FILL_AND_ALIGN_TOP = EVAS_HINT_FILL, 0.0 15FILL_AND_ALIGN_TOP = EVAS_HINT_FILL, 0.0
18 16
19def cb_cs_changed(cs, rect): 17def cb_cs_changed(cs, rect):
diff --git a/examples/elementary/test_config.py b/examples/elementary/test_config.py
index 43f6092..40df48e 100644
--- a/examples/elementary/test_config.py
+++ b/examples/elementary/test_config.py
@@ -3,9 +3,11 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_FILL, EVAS_HINT_EXPAND, EXPAND_BOTH, \
7 EXPAND_HORIZ, FILL_BOTH, FILL_HORIZ
6from efl import elementary 8from efl import elementary
7from efl.elementary.window import StandardWindow, Window, ELM_WIN_INLINED_IMAGE, \ 9from efl.elementary.window import StandardWindow, Window, \
8 ELM_WIN_SOCKET_IMAGE 10 ELM_WIN_INLINED_IMAGE, ELM_WIN_SOCKET_IMAGE
9from efl.elementary.button import Button 11from efl.elementary.button import Button
10from efl.elementary.background import Background 12from efl.elementary.background import Background
11from efl.elementary.label import Label 13from efl.elementary.label import Label
@@ -20,12 +22,8 @@ from efl.elementary.layout import Layout
20from efl.elementary.configuration import Configuration 22from efl.elementary.configuration import Configuration
21elm_conf = Configuration() 23elm_conf = Configuration()
22 24
23from efl.evas import EVAS_HINT_FILL, EVAS_HINT_EXPAND
24 25
25EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND 26
26EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
27FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
28FILL_HORIZ = EVAS_HINT_FILL, 0.5
29 27
30script_path = os.path.dirname(os.path.abspath(__file__)) 28script_path = os.path.dirname(os.path.abspath(__file__))
31img_path = os.path.join(script_path, "images") 29img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_conform.py b/examples/elementary/test_conform.py
index cef9a12..bd1f7ad 100644
--- a/examples/elementary/test_conform.py
+++ b/examples/elementary/test_conform.py
@@ -13,12 +13,9 @@ from efl.elementary.label import Label
13from efl.elementary.list import List 13from efl.elementary.list import List
14from efl.elementary.scroller import Scrollable 14from efl.elementary.scroller import Scrollable
15 15
16from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 16from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, \
17 EXPAND_HORIZ, FILL_BOTH, FILL_HORIZ
17 18
18EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
19EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
20FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
21FILL_HORIZ = EVAS_HINT_FILL, 0.5
22 19
23class ScrollableEntry(Scrollable, Entry): 20class ScrollableEntry(Scrollable, Entry):
24 def __init__(self, canvas, *args, **kwargs): 21 def __init__(self, canvas, *args, **kwargs):
diff --git a/examples/elementary/test_core_evas_canvas_callbacks.py b/examples/elementary/test_core_evas_canvas_callbacks.py
index 8a1f5c8..bf78f80 100644
--- a/examples/elementary/test_core_evas_canvas_callbacks.py
+++ b/examples/elementary/test_core_evas_canvas_callbacks.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH, \
5 EVAS_CALLBACK_RENDER_PRE, EVAS_CALLBACK_RENDER_POST, \ 5 EVAS_CALLBACK_RENDER_PRE, EVAS_CALLBACK_RENDER_POST, \
6 EVAS_CALLBACK_CANVAS_FOCUS_IN, EVAS_CALLBACK_CANVAS_FOCUS_OUT, \ 6 EVAS_CALLBACK_CANVAS_FOCUS_IN, EVAS_CALLBACK_CANVAS_FOCUS_OUT, \
7 EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, \ 7 EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, \
@@ -19,8 +19,6 @@ from efl.elementary.window import StandardWindow
19from efl.elementary.box import Box 19from efl.elementary.box import Box
20from efl.elementary.button import Button 20from efl.elementary.button import Button
21 21
22EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
23FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
24 22
25def btn_del_cbs_cb(button): 23def btn_del_cbs_cb(button):
26 canvas = button.evas_get() 24 canvas = button.evas_get()
diff --git a/examples/elementary/test_core_evas_object_callbacks.py b/examples/elementary/test_core_evas_object_callbacks.py
index 5d2a1f8..9961500 100644
--- a/examples/elementary/test_core_evas_object_callbacks.py
+++ b/examples/elementary/test_core_evas_object_callbacks.py
@@ -13,14 +13,12 @@ from efl.evas import EVAS_CALLBACK_MOUSE_IN, EVAS_CALLBACK_MOUSE_OUT, \
13 EVAS_CALLBACK_DEL, EVAS_CALLBACK_HOLD, \ 13 EVAS_CALLBACK_DEL, EVAS_CALLBACK_HOLD, \
14 EVAS_CALLBACK_CHANGED_SIZE_HINTS, \ 14 EVAS_CALLBACK_CHANGED_SIZE_HINTS, \
15 EVAS_CALLBACK_IMAGE_PRELOADED, EVAS_CALLBACK_IMAGE_UNLOADED, \ 15 EVAS_CALLBACK_IMAGE_PRELOADED, EVAS_CALLBACK_IMAGE_UNLOADED, \
16 Text, Rectangle, EVAS_HINT_EXPAND, EVAS_HINT_FILL 16 Text, Rectangle, EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
17from efl import elementary 17from efl import elementary
18from efl.elementary.window import StandardWindow 18from efl.elementary.window import StandardWindow
19from efl.elementary.box import Box 19from efl.elementary.box import Box
20from efl.elementary.button import Button 20from efl.elementary.button import Button
21 21
22EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
23FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
24 22
25def btn_del_cbs_cb(button, rect): 23def btn_del_cbs_cb(button, rect):
26 rect.event_callback_del(EVAS_CALLBACK_MOUSE_IN, events_cb2) 24 rect.event_callback_del(EVAS_CALLBACK_MOUSE_IN, events_cb2)
diff --git a/examples/elementary/test_core_evas_smart.py b/examples/elementary/test_core_evas_smart.py
index 8c8574e..5c733c9 100644
--- a/examples/elementary/test_core_evas_smart.py
+++ b/examples/elementary/test_core_evas_smart.py
@@ -4,14 +4,13 @@
4import os 4import os
5from random import randint 5from random import randint
6 6
7from efl.evas import SmartObject, EVAS_HINT_EXPAND, EVAS_HINT_FILL 7from efl.evas import SmartObject, EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
8 EXPAND_BOTH, FILL_BOTH
8from efl import elementary 9from efl import elementary
9from efl.elementary.window import StandardWindow 10from efl.elementary.window import StandardWindow
10from efl.elementary.box import Box 11from efl.elementary.box import Box
11from efl.elementary.button import Button 12from efl.elementary.button import Button
12 13
13EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
14FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
15 14
16script_path = os.path.dirname(os.path.abspath(__file__)) 15script_path = os.path.dirname(os.path.abspath(__file__))
17ic_file = os.path.join(script_path, "images", "logo.png") 16ic_file = os.path.join(script_path, "images", "logo.png")
diff --git a/examples/elementary/test_ctxpopup.py b/examples/elementary/test_ctxpopup.py
index af874a0..a945651 100644
--- a/examples/elementary/test_ctxpopup.py
+++ b/examples/elementary/test_ctxpopup.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, FilledImage 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, FilledImage, \
7 EXPAND_BOTH, FILL_BOTH
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 10from efl.elementary.box import Box
@@ -13,8 +14,6 @@ from efl.elementary.list import List, ELM_LIST_COMPRESS
13from efl.elementary.ctxpopup import Ctxpopup 14from efl.elementary.ctxpopup import Ctxpopup
14from efl.elementary.scroller import Scroller 15from efl.elementary.scroller import Scroller
15 16
16EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
17FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
18 17
19script_path = os.path.dirname(os.path.abspath(__file__)) 18script_path = os.path.dirname(os.path.abspath(__file__))
20img_path = os.path.join(script_path, "images") 19img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_cursor.py b/examples/elementary/test_cursor.py
index 2471d45..a079392 100644
--- a/examples/elementary/test_cursor.py
+++ b/examples/elementary/test_cursor.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 10from efl.elementary.box import Box
@@ -17,10 +18,6 @@ from efl.elementary.toolbar import Toolbar
17from efl.elementary.theme import Theme 18from efl.elementary.theme import Theme
18from efl.elementary.configuration import Configuration 19from efl.elementary.configuration import Configuration
19 20
20EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
21EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
22FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
23FILL_HORIZ = EVAS_HINT_FILL, 0.5
24 21
25script_path = os.path.dirname(os.path.abspath(__file__)) 22script_path = os.path.dirname(os.path.abspath(__file__))
26 23
diff --git a/examples/elementary/test_datetime.py b/examples/elementary/test_datetime.py
index faba10a..ddaa6c3 100644
--- a/examples/elementary/test_datetime.py
+++ b/examples/elementary/test_datetime.py
@@ -2,7 +2,8 @@
2# encoding: utf-8 2# encoding: utf-8
3 3
4 4
5from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 5from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, \
6 FILL_BOTH, FILL_HORIZ
6from efl import elementary 7from efl import elementary
7from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
8from efl.elementary.background import Background 9from efl.elementary.background import Background
@@ -13,9 +14,6 @@ from efl.elementary.datetime_elm import Datetime, ELM_DATETIME_MINUTE, \
13 14
14from datetime import datetime 15from datetime import datetime
15 16
16EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
17FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
18FILL_HORIZ = EVAS_HINT_FILL, 0.5
19 17
20def changed_cb(obj): 18def changed_cb(obj):
21 print("Datetime value is changed") 19 print("Datetime value is changed")
diff --git a/examples/elementary/test_dayselector.py b/examples/elementary/test_dayselector.py
index 45b1a9e..877d500 100644
--- a/examples/elementary/test_dayselector.py
+++ b/examples/elementary/test_dayselector.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, \
5 FILL_BOTH, FILL_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 8from efl.elementary.box import Box
@@ -16,9 +17,6 @@ from efl.elementary.dayselector import Dayselector, ELM_DAYSELECTOR_SUN, \
16 ELM_DAYSELECTOR_MON, ELM_DAYSELECTOR_TUE, ELM_DAYSELECTOR_WED, \ 17 ELM_DAYSELECTOR_MON, ELM_DAYSELECTOR_TUE, ELM_DAYSELECTOR_WED, \
17 ELM_DAYSELECTOR_THU, ELM_DAYSELECTOR_FRI, ELM_DAYSELECTOR_SAT 18 ELM_DAYSELECTOR_THU, ELM_DAYSELECTOR_FRI, ELM_DAYSELECTOR_SAT
18 19
19EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
20FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
21FILL_HORIZ = EVAS_HINT_FILL, 0.5
22 20
23def cb_changed(ds): 21def cb_changed(ds):
24 print("\nSelected Days:") 22 print("\nSelected Days:")
diff --git a/examples/elementary/test_diskselector.py b/examples/elementary/test_diskselector.py
index b068301..a2e4bea 100644
--- a/examples/elementary/test_diskselector.py
+++ b/examples/elementary/test_diskselector.py
@@ -3,16 +3,14 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, \
7 FILL_BOTH, FILL_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 10from efl.elementary.box import Box
10from efl.elementary.icon import Icon 11from efl.elementary.icon import Icon
11from efl.elementary.diskselector import Diskselector 12from efl.elementary.diskselector import Diskselector
12 13
13EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
14FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
15FILL_HORIZ = EVAS_HINT_FILL, 0.5
16 14
17months=["January", "February", "March", "April", "May", "June", "August", "September", "October", "November", "December"] 15months=["January", "February", "March", "April", "May", "June", "August", "September", "October", "November", "December"]
18weekdays=["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"] 16weekdays=["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
diff --git a/examples/elementary/test_dnd.py b/examples/elementary/test_dnd.py
index 8545d2b..4c33e9c 100644
--- a/examples/elementary/test_dnd.py
+++ b/examples/elementary/test_dnd.py
@@ -5,7 +5,7 @@ import os
5 5
6from efl.ecore import Timer, ECORE_CALLBACK_CANCEL, ECORE_CALLBACK_RENEW, \ 6from efl.ecore import Timer, ECORE_CALLBACK_CANCEL, ECORE_CALLBACK_RENEW, \
7 AnimatorTimeline 7 AnimatorTimeline
8from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 8from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH, \
9 EVAS_ASPECT_CONTROL_VERTICAL, EVAS_CALLBACK_MOUSE_MOVE, \ 9 EVAS_ASPECT_CONTROL_VERTICAL, EVAS_CALLBACK_MOUSE_MOVE, \
10 EVAS_CALLBACK_MOUSE_UP, EVAS_CALLBACK_MOUSE_DOWN, \ 10 EVAS_CALLBACK_MOUSE_UP, EVAS_CALLBACK_MOUSE_DOWN, \
11 EVAS_EVENT_FLAG_ON_HOLD 11 EVAS_EVENT_FLAG_ON_HOLD
@@ -22,8 +22,6 @@ from efl.elementary.gengrid import Gengrid, GengridItemClass
22from efl.elementary.configuration import Configuration 22from efl.elementary.configuration import Configuration
23conf = Configuration() 23conf = Configuration()
24 24
25EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
26FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
27 25
28script_path = os.path.dirname(os.path.abspath(__file__)) 26script_path = os.path.dirname(os.path.abspath(__file__))
29img_path = os.path.join(script_path, "images") 27img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_entry.py b/examples/elementary/test_entry.py
index 44fe8aa..1070f15 100644
--- a/examples/elementary/test_entry.py
+++ b/examples/elementary/test_entry.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH, \
5 EXPAND_HORIZ, FILL_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.background import Background 8from efl.elementary.background import Background
@@ -17,10 +18,6 @@ from efl.elementary.icon import Icon
17from efl.elementary.scroller import Scrollable, ELM_SCROLLER_POLICY_OFF, \ 18from efl.elementary.scroller import Scrollable, ELM_SCROLLER_POLICY_OFF, \
18 ELM_SCROLLER_POLICY_ON 19 ELM_SCROLLER_POLICY_ON
19 20
20EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
21EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
22FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
23FILL_HORIZ = EVAS_HINT_FILL, 0.5
24 21
25SCROLL_POLICY_OFF = ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF 22SCROLL_POLICY_OFF = ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF
26SCROLL_POLICY_ON = ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON 23SCROLL_POLICY_ON = ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON
diff --git a/examples/elementary/test_external.py b/examples/elementary/test_external.py
index e09d616..e575ed7 100644
--- a/examples/elementary/test_external.py
+++ b/examples/elementary/test_external.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl.ecore import Timer 7from efl.ecore import Timer
8from efl import edje 8from efl import edje
9from efl import elementary 9from efl import elementary
@@ -16,8 +16,6 @@ from efl.elementary.frame import Frame
16from efl.elementary.label import Label 16from efl.elementary.label import Label
17from efl.elementary.list import List 17from efl.elementary.list import List
18 18
19EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
20FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
21 19
22script_path = os.path.dirname(os.path.abspath(__file__)) 20script_path = os.path.dirname(os.path.abspath(__file__))
23img_path = os.path.join(script_path, "images") 21img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_fileselector.py b/examples/elementary/test_fileselector.py
index 157594d..50840f6 100644
--- a/examples/elementary/test_fileselector.py
+++ b/examples/elementary/test_fileselector.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box, ELM_BOX_LAYOUT_FLOW_HORIZONTAL 9from efl.elementary.box import Box, ELM_BOX_LAYOUT_FLOW_HORIZONTAL
@@ -23,9 +23,6 @@ from efl.elementary.fileselector import Fileselector, \
23 ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC, ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC 23 ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC, ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC
24 24
25 25
26EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
27FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
28
29 26
30def fs_cb_done(fs, selected, win): 27def fs_cb_done(fs, selected, win):
31 win.delete() 28 win.delete()
diff --git a/examples/elementary/test_fileselector_button.py b/examples/elementary/test_fileselector_button.py
index ed26a8f..99cb192 100644
--- a/examples/elementary/test_fileselector_button.py
+++ b/examples/elementary/test_fileselector_button.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
@@ -9,8 +9,6 @@ from efl.elementary.check import Check
9from efl.elementary.fileselector_button import FileselectorButton 9from efl.elementary.fileselector_button import FileselectorButton
10from efl.elementary.separator import Separator 10from efl.elementary.separator import Separator
11 11
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
14 12
15def toggle_is_save(bt, fsb): 13def toggle_is_save(bt, fsb):
16 print("Toggle is save") 14 print("Toggle is save")
diff --git a/examples/elementary/test_fileselector_entry.py b/examples/elementary/test_fileselector_entry.py
index 6098139..4c4b5db 100644
--- a/examples/elementary/test_fileselector_entry.py
+++ b/examples/elementary/test_fileselector_entry.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
@@ -9,9 +9,6 @@ from efl.elementary.check import Check
9from efl.elementary.fileselector_entry import FileselectorEntry 9from efl.elementary.fileselector_entry import FileselectorEntry
10from efl.elementary.separator import Separator 10from efl.elementary.separator import Separator
11 11
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
14
15 12
16def toggle_is_save(bt, fse): 13def toggle_is_save(bt, fse):
17 print("Toggle is save") 14 print("Toggle is save")
diff --git a/examples/elementary/test_flip.py b/examples/elementary/test_flip.py
index 63cd52e..6501b6a 100644
--- a/examples/elementary/test_flip.py
+++ b/examples/elementary/test_flip.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, \
7 FILL_BOTH, EXPAND_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.background import Background 10from efl.elementary.background import Background
@@ -24,9 +25,6 @@ from efl.elementary.flip import Flip, ELM_FLIP_ROTATE_X_CENTER_AXIS, \
24 ELM_FLIP_INTERACTION_NONE, ELM_FLIP_INTERACTION_ROTATE, \ 25 ELM_FLIP_INTERACTION_NONE, ELM_FLIP_INTERACTION_ROTATE, \
25 ELM_FLIP_INTERACTION_CUBE, ELM_FLIP_INTERACTION_PAGE 26 ELM_FLIP_INTERACTION_CUBE, ELM_FLIP_INTERACTION_PAGE
26 27
27EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
28EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
29FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
30 28
31script_path = os.path.dirname(os.path.abspath(__file__)) 29script_path = os.path.dirname(os.path.abspath(__file__))
32img_path = os.path.join(script_path, "images") 30img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_flipselector.py b/examples/elementary/test_flipselector.py
index 132571b..5c66e79 100644
--- a/examples/elementary/test_flipselector.py
+++ b/examples/elementary/test_flipselector.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
@@ -9,8 +9,6 @@ from efl.elementary.button import Button
9from efl.elementary.slider import Slider 9from efl.elementary.slider import Slider
10from efl.elementary.flipselector import FlipSelector 10from efl.elementary.flipselector import FlipSelector
11 11
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
14 12
15def sel_cb(fp, *args): 13def sel_cb(fp, *args):
16 if args: 14 if args:
diff --git a/examples/elementary/test_floating.py b/examples/elementary/test_floating.py
index aa1abc3..1be0d64 100644
--- a/examples/elementary/test_floating.py
+++ b/examples/elementary/test_floating.py
@@ -11,10 +11,8 @@ from efl.elementary.genlist import Genlist, GenlistItem, GenlistItemClass, \
11from efl.elementary.icon import Icon 11from efl.elementary.icon import Icon
12from efl.ecore import Animator, loop_time_get 12from efl.ecore import Animator, loop_time_get
13from efl.evas import EVAS_ASPECT_CONTROL_VERTICAL, EVAS_HINT_EXPAND, \ 13from efl.evas import EVAS_ASPECT_CONTROL_VERTICAL, EVAS_HINT_EXPAND, \
14 EVAS_HINT_FILL 14 EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
15 15
16EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
17FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
18 16
19script_path = os.path.dirname(os.path.abspath(__file__)) 17script_path = os.path.dirname(os.path.abspath(__file__))
20img_path = os.path.join(script_path, "images") 18img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_focus.py b/examples/elementary/test_focus.py
index 9856a64..ef26098 100644
--- a/examples/elementary/test_focus.py
+++ b/examples/elementary/test_focus.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
7from efl import elementary 8from efl import elementary
8from efl import edje 9from efl import edje
9from efl.elementary.window import StandardWindow 10from efl.elementary.window import StandardWindow
@@ -25,10 +26,6 @@ from efl.elementary.object import ELM_FOCUS_DOWN, ELM_FOCUS_UP
25from efl.elementary.configuration import Configuration 26from efl.elementary.configuration import Configuration
26from efl.elementary.theme import theme_overlay_add 27from efl.elementary.theme import theme_overlay_add
27 28
28EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
29EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
30FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
31FILL_HORIZ = EVAS_HINT_FILL, 0.5
32 29
33script_path = os.path.dirname(os.path.abspath(__file__)) 30script_path = os.path.dirname(os.path.abspath(__file__))
34edj_file = os.path.join(script_path, "test.edj") 31edj_file = os.path.join(script_path, "test.edj")
diff --git a/examples/elementary/test_frame.py b/examples/elementary/test_frame.py
index 9b1a779..5aa979d 100644
--- a/examples/elementary/test_frame.py
+++ b/examples/elementary/test_frame.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.scroller import Scroller 9from efl.elementary.scroller import Scroller
@@ -13,8 +13,6 @@ from efl.elementary.frame import Frame
13from efl.elementary.icon import Icon 13from efl.elementary.icon import Icon
14from efl.elementary.label import Label 14from efl.elementary.label import Label
15 15
16EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
17FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
18 16
19script_path = os.path.dirname(os.path.abspath(__file__)) 17script_path = os.path.dirname(os.path.abspath(__file__))
20img_path = os.path.join(script_path, "images") 18img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_gengrid.py b/examples/elementary/test_gengrid.py
index 302c451..8986499 100644
--- a/examples/elementary/test_gengrid.py
+++ b/examples/elementary/test_gengrid.py
@@ -4,7 +4,8 @@
4import random 4import random
5import os 5import os
6 6
7from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EVAS_ASPECT_CONTROL_BOTH 7from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH, \
8 EXPAND_HORIZ, FILL_HORIZ, EVAS_ASPECT_CONTROL_BOTH
8from efl import elementary 9from efl import elementary
9from efl.elementary.window import StandardWindow 10from efl.elementary.window import StandardWindow
10from efl.elementary.background import Background 11from efl.elementary.background import Background
@@ -19,10 +20,6 @@ from efl.elementary.slider import Slider
19from efl.elementary.table import Table 20from efl.elementary.table import Table
20from efl.elementary.scroller import Scrollable 21from efl.elementary.scroller import Scrollable
21 22
22EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
23EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
24FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
25FILL_HORIZ = EVAS_HINT_FILL, 0.5
26 23
27script_path = os.path.dirname(os.path.abspath(__file__)) 24script_path = os.path.dirname(os.path.abspath(__file__))
28img_path = os.path.join(script_path, "images") 25img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_genlist.py b/examples/elementary/test_genlist.py
index 6bdea80..0b96e53 100644
--- a/examples/elementary/test_genlist.py
+++ b/examples/elementary/test_genlist.py
@@ -8,6 +8,7 @@ import os
8 8
9from efl import evas 9from efl import evas
10from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 10from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
11 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ, \
11 EVAS_ASPECT_CONTROL_VERTICAL, Rectangle 12 EVAS_ASPECT_CONTROL_VERTICAL, Rectangle
12from efl.ecore import Timer 13from efl.ecore import Timer
13from efl import elementary 14from efl import elementary
@@ -28,10 +29,6 @@ from efl.elementary.radio import Radio
28from efl.elementary.check import Check 29from efl.elementary.check import Check
29from efl.elementary.entry import Entry 30from efl.elementary.entry import Entry
30 31
31EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
32EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
33FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
34FILL_HORIZ = EVAS_HINT_FILL, 0.5
35 32
36script_path = os.path.dirname(os.path.abspath(__file__)) 33script_path = os.path.dirname(os.path.abspath(__file__))
37img_path = os.path.join(script_path, "images") 34img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_gesture_layer.py b/examples/elementary/test_gesture_layer.py
index 5792f05..15fd6e3 100644
--- a/examples/elementary/test_gesture_layer.py
+++ b/examples/elementary/test_gesture_layer.py
@@ -15,10 +15,9 @@ from efl.elementary.layout import Layout
15from efl.elementary.entry import Entry, ELM_WRAP_MIXED 15from efl.elementary.entry import Entry, ELM_WRAP_MIXED
16from efl.elementary.icon import Icon 16from efl.elementary.icon import Icon
17 17
18from efl.evas import EVAS_HINT_EXPAND, EVAS_EVENT_FLAG_NONE, Map, Polygon 18from efl.evas import EVAS_HINT_EXPAND, EXPAND_BOTH, FILL_BOTH, \
19 EVAS_EVENT_FLAG_NONE, Map, Polygon
19 20
20EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
21EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
22 21
23script_path = os.path.dirname(os.path.abspath(__file__)) 22script_path = os.path.dirname(os.path.abspath(__file__))
24img_path = os.path.join(script_path, "images") 23img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_grid.py b/examples/elementary/test_grid.py
index af80e7a..ac007d7 100644
--- a/examples/elementary/test_grid.py
+++ b/examples/elementary/test_grid.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, Rectangle 4from efl.evas import EVAS_HINT_EXPAND, EXPAND_BOTH, FILL_BOTH, Rectangle
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
@@ -9,7 +9,6 @@ from efl.elementary.button import Button
9from efl.elementary.entry import Entry 9from efl.elementary.entry import Entry
10from efl.elementary.grid import Grid, grid_pack_get, grid_pack_set 10from efl.elementary.grid import Grid, grid_pack_get, grid_pack_set
11 11
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13 12
14def cb_change(bt): 13def cb_change(bt):
15 (x, y, w, h) = grid_pack_get(bt) 14 (x, y, w, h) = grid_pack_get(bt)
diff --git a/examples/elementary/test_hover.py b/examples/elementary/test_hover.py
index 7020d6e..007cd6d 100644
--- a/examples/elementary/test_hover.py
+++ b/examples/elementary/test_hover.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 9from efl.elementary.box import Box
@@ -14,8 +14,6 @@ from efl.elementary.label import Label
14from efl.elementary.list import List 14from efl.elementary.list import List
15from efl.elementary.icon import Icon 15from efl.elementary.icon import Icon
16 16
17EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
18FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
19 17
20script_path = os.path.dirname(os.path.abspath(__file__)) 18script_path = os.path.dirname(os.path.abspath(__file__))
21img_path = os.path.join(script_path, "images") 19img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_hoversel.py b/examples/elementary/test_hoversel.py
index 27936ff..45a6739 100644
--- a/examples/elementary/test_hoversel.py
+++ b/examples/elementary/test_hoversel.py
@@ -4,14 +4,13 @@
4import os 4import os
5 5
6from efl.ecore import Timer 6from efl.ecore import Timer
7from efl.evas import EVAS_HINT_EXPAND 7from efl.evas import EVAS_HINT_EXPAND, EXPAND_BOTH, FILL_BOTH
8from efl import elementary 8from efl import elementary
9from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
10from efl.elementary.box import Box 10from efl.elementary.box import Box
11from efl.elementary.hoversel import Hoversel, ELM_ICON_STANDARD, ELM_ICON_FILE 11from efl.elementary.hoversel import Hoversel, ELM_ICON_STANDARD, ELM_ICON_FILE
12from efl.elementary.icon import Icon 12from efl.elementary.icon import Icon
13 13
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15WEIGHT_ZERO = 0.0, 0.0 14WEIGHT_ZERO = 0.0, 0.0
16ALIGN_CENTER = 0.5, 0.5 15ALIGN_CENTER = 0.5, 0.5
17 16
diff --git a/examples/elementary/test_icon.py b/examples/elementary/test_icon.py
index 9e099b0..3beed57 100644
--- a/examples/elementary/test_icon.py
+++ b/examples/elementary/test_icon.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow, Window, ELM_WIN_BASIC 9from efl.elementary.window import StandardWindow, Window, ELM_WIN_BASIC
9from efl.elementary.box import Box 10from efl.elementary.box import Box
@@ -18,10 +19,6 @@ from efl.elementary.radio import Radio
18from efl.elementary.theme import Theme 19from efl.elementary.theme import Theme
19 20
20 21
21EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
22EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
23FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
24
25script_path = os.path.dirname(os.path.abspath(__file__)) 22script_path = os.path.dirname(os.path.abspath(__file__))
26img_path = os.path.join(script_path, "images") 23img_path = os.path.join(script_path, "images")
27 24
diff --git a/examples/elementary/test_image.py b/examples/elementary/test_image.py
index 1230c72..c4cfebf 100644
--- a/examples/elementary/test_image.py
+++ b/examples/elementary/test_image.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box, ELM_BOX_LAYOUT_FLOW_HORIZONTAL 9from efl.elementary.box import Box, ELM_BOX_LAYOUT_FLOW_HORIZONTAL
@@ -14,8 +14,6 @@ from efl.elementary.image import Image, ELM_IMAGE_ROTATE_90, \
14from efl.elementary.progressbar import Progressbar 14from efl.elementary.progressbar import Progressbar
15from efl.elementary.separator import Separator 15from efl.elementary.separator import Separator
16 16
17EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
18FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
19 17
20script_path = os.path.dirname(os.path.abspath(__file__)) 18script_path = os.path.dirname(os.path.abspath(__file__))
21img_path = os.path.join(script_path, "images") 19img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_index.py b/examples/elementary/test_index.py
index 842a057..076d525 100644
--- a/examples/elementary/test_index.py
+++ b/examples/elementary/test_index.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 8from efl.elementary.box import Box
@@ -10,9 +11,6 @@ from efl.elementary.index import Index
10from efl.elementary.genlist import Genlist, GenlistItem, GenlistItemClass 11from efl.elementary.genlist import Genlist, GenlistItem, GenlistItemClass
11from efl.elementary.separator import Separator 12from efl.elementary.separator import Separator
12 13
13EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
14EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
15FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
16 14
17def gl_text_get(gl, part, data): 15def gl_text_get(gl, part, data):
18 return str(data) 16 return str(data)
diff --git a/examples/elementary/test_input_events.py b/examples/elementary/test_input_events.py
index 4b1a8e3..a3b19e5 100644
--- a/examples/elementary/test_input_events.py
+++ b/examples/elementary/test_input_events.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
5from efl import elementary 5from efl import elementary
6 6
7from efl.elementary.box import Box 7from efl.elementary.box import Box
@@ -10,8 +10,6 @@ from efl.elementary.entry import Entry, utf8_to_markup
10from efl.elementary.object import EVAS_CALLBACK_KEY_UP 10from efl.elementary.object import EVAS_CALLBACK_KEY_UP
11from efl.elementary.window import StandardWindow 11from efl.elementary.window import StandardWindow
12 12
13EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
14FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
15 13
16def filter_cb(obj, text, data): 14def filter_cb(obj, text, data):
17 return None 15 return None
diff --git a/examples/elementary/test_label.py b/examples/elementary/test_label.py
index 21b239e..4b0e794 100644
--- a/examples/elementary/test_label.py
+++ b/examples/elementary/test_label.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, Rectangle 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, Rectangle, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 8from efl.elementary.box import Box
@@ -11,10 +12,6 @@ from efl.elementary.radio import Radio
11from efl.elementary.separator import Separator 12from efl.elementary.separator import Separator
12from efl.elementary.slider import Slider 13from efl.elementary.slider import Slider
13 14
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17FILL_HORIZ = EVAS_HINT_FILL, 0.5
18 15
19def cb_slide_radio(radio, lb): 16def cb_slide_radio(radio, lb):
20 lb.style = radio.text 17 lb.style = radio.text
diff --git a/examples/elementary/test_layout.py b/examples/elementary/test_layout.py
index 1ab7477..36bea8b 100644
--- a/examples/elementary/test_layout.py
+++ b/examples/elementary/test_layout.py
@@ -3,13 +3,12 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND 6from efl.evas import EVAS_HINT_EXPAND, EXPAND_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.button import Button 9from efl.elementary.button import Button
10from efl.elementary.layout import Layout 10from efl.elementary.layout import Layout
11 11
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13 12
14script_path = os.path.dirname(os.path.abspath(__file__)) 13script_path = os.path.dirname(os.path.abspath(__file__))
15 14
diff --git a/examples/elementary/test_list.py b/examples/elementary/test_list.py
index be0dbd4..4a089d3 100644
--- a/examples/elementary/test_list.py
+++ b/examples/elementary/test_list.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow, Window, ELM_WIN_BASIC 9from efl.elementary.window import StandardWindow, Window, ELM_WIN_BASIC
9from efl.elementary.background import Background 10from efl.elementary.background import Background
@@ -15,9 +16,7 @@ from efl.elementary.list import List, ELM_LIST_LIMIT, ELM_LIST_COMPRESS
15from efl.elementary.icon import Icon 16from efl.elementary.icon import Icon
16from efl.elementary.table import Table 17from efl.elementary.table import Table
17 18
18EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND 19
19EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
20FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
21ALIGN_CENTER = 0.5, 0.5 20ALIGN_CENTER = 0.5, 0.5
22 21
23script_path = os.path.dirname(os.path.abspath(__file__)) 22script_path = os.path.dirname(os.path.abspath(__file__))
diff --git a/examples/elementary/test_map.py b/examples/elementary/test_map.py
index a5faed8..f64e7e1 100644
--- a/examples/elementary/test_map.py
+++ b/examples/elementary/test_map.py
@@ -4,7 +4,9 @@
4import os 4import os
5from random import randint 5from random import randint
6 6
7from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EVAS_CALLBACK_MOUSE_DOWN 7from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
8 EVAS_CALLBACK_MOUSE_DOWN, \
9 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
8from efl import elementary 10from efl import elementary
9from efl.elementary.window import StandardWindow 11from efl.elementary.window import StandardWindow
10from efl.elementary.box import Box 12from efl.elementary.box import Box
@@ -21,10 +23,6 @@ from efl.elementary.map import Map, MapOverlayClass, ELM_MAP_OVERLAY_TYPE_CLASS,
21from efl.elementary.menu import Menu 23from efl.elementary.menu import Menu
22from efl.elementary.slider import Slider 24from efl.elementary.slider import Slider
23 25
24EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
25EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
26FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
27FILL_HORIZ = EVAS_HINT_FILL, 0.5
28 26
29elementary.need_efreet() 27elementary.need_efreet()
30 28
diff --git a/examples/elementary/test_mapbuf.py b/examples/elementary/test_mapbuf.py
index 0d9d89f..bce97ff 100644
--- a/examples/elementary/test_mapbuf.py
+++ b/examples/elementary/test_mapbuf.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, Rectangle 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, Rectangle, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import Window, ELM_WIN_BASIC 9from efl.elementary.window import Window, ELM_WIN_BASIC
9from efl.elementary.background import Background 10from efl.elementary.background import Background
@@ -16,10 +17,6 @@ from efl.elementary.mapbuf import Mapbuf
16from efl.elementary.scroller import Scroller, ELM_SCROLLER_POLICY_OFF 17from efl.elementary.scroller import Scroller, ELM_SCROLLER_POLICY_OFF
17from efl.elementary.table import Table 18from efl.elementary.table import Table
18 19
19EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
20EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
21FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
22FILL_HORIZ = EVAS_HINT_FILL, 0.5
23ALIGN_CENTER = 0.5, 0.5 20ALIGN_CENTER = 0.5, 0.5
24 21
25SCROLL_POLICY_OFF = ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF 22SCROLL_POLICY_OFF = ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF
diff --git a/examples/elementary/test_menu.py b/examples/elementary/test_menu.py
index 7d2f3d8..94f43e6 100644
--- a/examples/elementary/test_menu.py
+++ b/examples/elementary/test_menu.py
@@ -1,12 +1,12 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_CALLBACK_MOUSE_DOWN, Rectangle 4from efl.evas import EVAS_HINT_EXPAND, EXPAND_BOTH, \
5 EVAS_CALLBACK_MOUSE_DOWN, Rectangle
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.menu import Menu 8from efl.elementary.menu import Menu
8 9
9EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
10 10
11def menu_show(rect, evtinfo, menu): 11def menu_show(rect, evtinfo, menu):
12 (x,y) = evtinfo.position.canvas 12 (x,y) = evtinfo.position.canvas
diff --git a/examples/elementary/test_multibuttonentry.py b/examples/elementary/test_multibuttonentry.py
index e401461..ea365d7 100644
--- a/examples/elementary/test_multibuttonentry.py
+++ b/examples/elementary/test_multibuttonentry.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 8from efl.elementary.box import Box
@@ -11,10 +12,6 @@ from efl.elementary.multibuttonentry import MultiButtonEntry
11from efl.elementary.scroller import Scroller, ELM_SCROLLER_POLICY_OFF, \ 12from efl.elementary.scroller import Scroller, ELM_SCROLLER_POLICY_OFF, \
12 ELM_SCROLLER_POLICY_AUTO 13 ELM_SCROLLER_POLICY_AUTO
13 14
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17FILL_HORIZ = EVAS_HINT_FILL, 0.5
18SCROLL_POLICY_VERT = ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO 15SCROLL_POLICY_VERT = ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO
19 16
20counter = 0 17counter = 0
diff --git a/examples/elementary/test_naviframe.py b/examples/elementary/test_naviframe.py
index 24ba6fb..644f5af 100644
--- a/examples/elementary/test_naviframe.py
+++ b/examples/elementary/test_naviframe.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 9from efl.elementary.box import Box
@@ -12,8 +12,6 @@ from efl.elementary.icon import Icon
12from efl.elementary.naviframe import Naviframe 12from efl.elementary.naviframe import Naviframe
13from efl.elementary.photo import Photo 13from efl.elementary.photo import Photo
14 14
15EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17 15
18script_path = os.path.dirname(os.path.abspath(__file__)) 16script_path = os.path.dirname(os.path.abspath(__file__))
19img_path = os.path.join(script_path, "images") 17img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_notify.py b/examples/elementary/test_notify.py
index 70db7f0..a62c2e2 100644
--- a/examples/elementary/test_notify.py
+++ b/examples/elementary/test_notify.py
@@ -3,7 +3,7 @@
3 3
4from __future__ import print_function 4from __future__ import print_function
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 9from efl.elementary.box import Box
@@ -12,8 +12,6 @@ from efl.elementary.label import Label
12from efl.elementary.notify import Notify, ELM_NOTIFY_ALIGN_FILL 12from efl.elementary.notify import Notify, ELM_NOTIFY_ALIGN_FILL
13from efl.elementary.table import Table 13from efl.elementary.table import Table
14 14
15EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17 15
18def notify_clicked(obj=None): 16def notify_clicked(obj=None):
19 win = StandardWindow("notify", "Notify", autodel=True, size=(400,400)) 17 win = StandardWindow("notify", "Notify", autodel=True, size=(400,400))
diff --git a/examples/elementary/test_panel.py b/examples/elementary/test_panel.py
index 9cba5af..fa11896 100644
--- a/examples/elementary/test_panel.py
+++ b/examples/elementary/test_panel.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 10from efl.elementary.box import Box
@@ -16,9 +17,6 @@ from efl.elementary.photo import Photo
16from efl.elementary.table import Table 17from efl.elementary.table import Table
17from efl.elementary.toolbar import Toolbar, ELM_TOOLBAR_SHRINK_NONE 18from efl.elementary.toolbar import Toolbar, ELM_TOOLBAR_SHRINK_NONE
18 19
19EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
20EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
21FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
22 20
23script_path = os.path.dirname(os.path.abspath(__file__)) 21script_path = os.path.dirname(os.path.abspath(__file__))
24img_file = os.path.join(script_path, "images", "plant_01.jpg") 22img_file = os.path.join(script_path, "images", "plant_01.jpg")
diff --git a/examples/elementary/test_panel_scroll.py b/examples/elementary/test_panel_scroll.py
index 3afcf92..016e9a7 100644
--- a/examples/elementary/test_panel_scroll.py
+++ b/examples/elementary/test_panel_scroll.py
@@ -2,7 +2,8 @@
2# encoding: utf-8 2# encoding: utf-8
3 3
4 4
5from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 5from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
6 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ
6from efl import elementary 7from efl import elementary
7from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
8from efl.elementary.box import Box 9from efl.elementary.box import Box
@@ -11,10 +12,6 @@ from efl.elementary.list import List
11from efl.elementary.panel import Panel, ELM_PANEL_ORIENT_LEFT 12from efl.elementary.panel import Panel, ELM_PANEL_ORIENT_LEFT
12from efl.elementary.table import Table 13from efl.elementary.table import Table
13 14
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17
18 15
19def panel_scroll_clicked(obj): 16def panel_scroll_clicked(obj):
20 win = StandardWindow("panel", "Panel test", autodel=True, size=(320, 400)) 17 win = StandardWindow("panel", "Panel test", autodel=True, size=(320, 400))
diff --git a/examples/elementary/test_panes.py b/examples/elementary/test_panes.py
index 7b55fe2..b28dfc7 100644
--- a/examples/elementary/test_panes.py
+++ b/examples/elementary/test_panes.py
@@ -1,14 +1,12 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.button import Button 7from efl.elementary.button import Button
8from efl.elementary.panes import Panes 8from efl.elementary.panes import Panes
9 9
10EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
11FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
12 10
13def cb_panes(panes, event): 11def cb_panes(panes, event):
14 print(("Event: %s" % (event))) 12 print(("Event: %s" % (event)))
diff --git a/examples/elementary/test_photo.py b/examples/elementary/test_photo.py
index f1b2c1a..790bbb2 100644
--- a/examples/elementary/test_photo.py
+++ b/examples/elementary/test_photo.py
@@ -3,17 +3,14 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.photo import Photo 10from efl.elementary.photo import Photo
10from efl.elementary.scroller import Scroller 11from efl.elementary.scroller import Scroller
11from efl.elementary.table import Table 12from efl.elementary.table import Table
12 13
13EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
14EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
15FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
16FILL_HORIZ = EVAS_HINT_FILL, 0.5
17 14
18script_path = os.path.dirname(os.path.abspath(__file__)) 15script_path = os.path.dirname(os.path.abspath(__file__))
19img_path = os.path.join(script_path, "images") 16img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_photocam.py b/examples/elementary/test_photocam.py
index 16b0361..ee9d589 100644
--- a/examples/elementary/test_photocam.py
+++ b/examples/elementary/test_photocam.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
@@ -13,9 +13,6 @@ from efl.elementary.separator import Separator
13from efl.elementary.table import Table 13from efl.elementary.table import Table
14from efl.elementary.fileselector_button import FileselectorButton 14from efl.elementary.fileselector_button import FileselectorButton
15 15
16EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
17FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
18
19 16
20remote_url = "http://eoimages.gsfc.nasa.gov/images/imagerecords/73000/73751/world.topo.bathy.200407.3x21600x10800.jpg" 17remote_url = "http://eoimages.gsfc.nasa.gov/images/imagerecords/73000/73751/world.topo.bathy.200407.3x21600x10800.jpg"
21 18
diff --git a/examples/elementary/test_popup.py b/examples/elementary/test_popup.py
index 7dfa4a3..f495e55 100644
--- a/examples/elementary/test_popup.py
+++ b/examples/elementary/test_popup.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, FilledImage 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH, \
7 FilledImage
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.button import Button 10from efl.elementary.button import Button
@@ -11,8 +12,6 @@ from efl.elementary.list import List, ELM_LIST_LIMIT
11from efl.elementary.icon import Icon 12from efl.elementary.icon import Icon
12from efl.elementary.popup import Popup, ELM_WRAP_CHAR 13from efl.elementary.popup import Popup, ELM_WRAP_CHAR
13 14
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
16 15
17script_path = os.path.dirname(os.path.abspath(__file__)) 16script_path = os.path.dirname(os.path.abspath(__file__))
18img_path = os.path.join(script_path, "images") 17img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_progressbar.py b/examples/elementary/test_progressbar.py
index 50d0999..f41a1de 100644
--- a/examples/elementary/test_progressbar.py
+++ b/examples/elementary/test_progressbar.py
@@ -4,7 +4,8 @@
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EVAS_ASPECT_CONTROL_VERTICAL, EVAS_ASPECT_CONTROL_HORIZONTAL, FilledImage 7 EVAS_ASPECT_CONTROL_VERTICAL, EVAS_ASPECT_CONTROL_HORIZONTAL, FilledImage, \
8 EXPAND_BOTH, FILL_BOTH, FILL_HORIZ
8from efl.ecore import Timer, ECORE_CALLBACK_RENEW, ECORE_CALLBACK_CANCEL 9from efl.ecore import Timer, ECORE_CALLBACK_RENEW, ECORE_CALLBACK_CANCEL
9from efl import elementary 10from efl import elementary
10from efl.elementary.window import StandardWindow 11from efl.elementary.window import StandardWindow
@@ -13,9 +14,6 @@ from efl.elementary.button import Button
13from efl.elementary.icon import Icon 14from efl.elementary.icon import Icon
14from efl.elementary.progressbar import Progressbar 15from efl.elementary.progressbar import Progressbar
15 16
16EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
17FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
18FILL_HORIZ = EVAS_HINT_FILL, 0.5
19 17
20script_path = os.path.dirname(os.path.abspath(__file__)) 18script_path = os.path.dirname(os.path.abspath(__file__))
21img_path = os.path.join(script_path, "images") 19img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_radio.py b/examples/elementary/test_radio.py
index a396b45..ebf07eb 100644
--- a/examples/elementary/test_radio.py
+++ b/examples/elementary/test_radio.py
@@ -4,16 +4,13 @@
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EVAS_ASPECT_CONTROL_VERTICAL 7 EVAS_ASPECT_CONTROL_VERTICAL, EXPAND_BOTH, FILL_BOTH, FILL_HORIZ
8from efl import elementary 8from efl import elementary
9from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
10from efl.elementary.box import Box 10from efl.elementary.box import Box
11from efl.elementary.icon import Icon 11from efl.elementary.icon import Icon
12from efl.elementary.radio import Radio 12from efl.elementary.radio import Radio
13 13
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
16FILL_HORIZ = EVAS_HINT_FILL, 0.5
17 14
18script_path = os.path.dirname(os.path.abspath(__file__)) 15script_path = os.path.dirname(os.path.abspath(__file__))
19img_path = os.path.join(script_path, "images") 16img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_scroller.py b/examples/elementary/test_scroller.py
index eac5976..1b9827b 100644
--- a/examples/elementary/test_scroller.py
+++ b/examples/elementary/test_scroller.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.background import Background 10from efl.elementary.background import Background
@@ -11,10 +12,6 @@ from efl.elementary.button import Button
11from efl.elementary.scroller import Scroller 12from efl.elementary.scroller import Scroller
12from efl.elementary.table import Table 13from efl.elementary.table import Table
13 14
14EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
15EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17FILL_HORIZ = EVAS_HINT_FILL, 0.5
18 15
19script_path = os.path.dirname(os.path.abspath(__file__)) 16script_path = os.path.dirname(os.path.abspath(__file__))
20img_path = os.path.join(script_path, "images") 17img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_segment_control.py b/examples/elementary/test_segment_control.py
index 9fb109f..97adb61 100644
--- a/examples/elementary/test_segment_control.py
+++ b/examples/elementary/test_segment_control.py
@@ -3,17 +3,14 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
7from efl import elementary 8from efl import elementary
8from efl.elementary.window import StandardWindow 9from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 10from efl.elementary.box import Box
10from efl.elementary.icon import Icon 11from efl.elementary.icon import Icon
11from efl.elementary.segment_control import SegmentControl 12from efl.elementary.segment_control import SegmentControl
12 13
13EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
14EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
15FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
16FILL_HORIZ = EVAS_HINT_FILL, 0.5
17 14
18script_path = os.path.dirname(os.path.abspath(__file__)) 15script_path = os.path.dirname(os.path.abspath(__file__))
19img_path = os.path.join(script_path, "images") 16img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_separator.py b/examples/elementary/test_separator.py
index ada3119..9871b82 100644
--- a/examples/elementary/test_separator.py
+++ b/examples/elementary/test_separator.py
@@ -1,14 +1,13 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow 6from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
8from efl.elementary.button import Button 8from efl.elementary.button import Button
9from efl.elementary.separator import Separator 9from efl.elementary.separator import Separator
10 10
11EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
12 11
13def separator_clicked(obj): 12def separator_clicked(obj):
14 win = StandardWindow("separators", "Separators", autodel=True) 13 win = StandardWindow("separators", "Separators", autodel=True)
diff --git a/examples/elementary/test_slider.py b/examples/elementary/test_slider.py
index ce715cd..e1d0ae1 100644
--- a/examples/elementary/test_slider.py
+++ b/examples/elementary/test_slider.py
@@ -4,7 +4,9 @@
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EVAS_ASPECT_CONTROL_VERTICAL, EVAS_ASPECT_CONTROL_HORIZONTAL 7 EVAS_ASPECT_CONTROL_VERTICAL, EVAS_ASPECT_CONTROL_HORIZONTAL, \
8 EXPAND_BOTH, EXPAND_HORIZ, EXPAND_VERT, \
9 FILL_BOTH, FILL_HORIZ, FILL_VERT
8from efl import elementary 10from efl import elementary
9from efl.elementary.window import StandardWindow 11from efl.elementary.window import StandardWindow
10from efl.elementary.box import Box 12from efl.elementary.box import Box
@@ -14,12 +16,7 @@ from efl.elementary.list import List
14from efl.elementary.icon import Icon 16from efl.elementary.icon import Icon
15from efl.elementary.slider import Slider 17from efl.elementary.slider import Slider
16 18
17EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND 19
18EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
19EXPAND_VERT = 0.0, EVAS_HINT_EXPAND
20FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
21FILL_HORIZ = EVAS_HINT_FILL, 0.5
22FILL_VERT = 0.5, EVAS_HINT_FILL
23ALIGN_CENTER = 0.5, 0.5 20ALIGN_CENTER = 0.5, 0.5
24ZERO_WEIGHT = 0.0, 0.0 21ZERO_WEIGHT = 0.0, 0.0
25 22
diff --git a/examples/elementary/test_slideshow.py b/examples/elementary/test_slideshow.py
index 6f08877..a3c6a44 100644
--- a/examples/elementary/test_slideshow.py
+++ b/examples/elementary/test_slideshow.py
@@ -4,7 +4,8 @@
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EVAS_CALLBACK_MOUSE_IN, \ 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EVAS_CALLBACK_MOUSE_IN, \
7 EVAS_CALLBACK_MOUSE_OUT, EVAS_CALLBACK_MOUSE_UP, EVAS_CALLBACK_MOUSE_MOVE 7 EVAS_CALLBACK_MOUSE_OUT, EVAS_CALLBACK_MOUSE_UP, EVAS_CALLBACK_MOUSE_MOVE, \
8 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
8from efl import elementary 9from efl import elementary
9from efl.elementary.window import StandardWindow 10from efl.elementary.window import StandardWindow
10from efl.elementary.background import Background 11from efl.elementary.background import Background
@@ -16,10 +17,6 @@ from efl.elementary.photo import Photo
16from efl.elementary.spinner import Spinner 17from efl.elementary.spinner import Spinner
17from efl.elementary.slideshow import Slideshow, SlideshowItemClass 18from efl.elementary.slideshow import Slideshow, SlideshowItemClass
18 19
19EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
20EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
21FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
22FILL_HORIZ = EVAS_HINT_FILL, 0.5
23 20
24script_path = os.path.dirname(os.path.abspath(__file__)) 21script_path = os.path.dirname(os.path.abspath(__file__))
25img_path = os.path.join(script_path, "images") 22img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_spinner.py b/examples/elementary/test_spinner.py
index 0c88b84..e1ca38f 100644
--- a/examples/elementary/test_spinner.py
+++ b/examples/elementary/test_spinner.py
@@ -1,16 +1,13 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 8from efl.elementary.box import Box
8from efl.elementary.spinner import Spinner 9from efl.elementary.spinner import Spinner
9 10
10EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
11EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
12FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
13FILL_HORIZ = EVAS_HINT_FILL, 0.5
14 11
15def spinner_clicked(obj): 12def spinner_clicked(obj):
16 win = StandardWindow("spinner", "Spinner test", autodel=True, 13 win = StandardWindow("spinner", "Spinner test", autodel=True,
diff --git a/examples/elementary/test_sys_notify.py b/examples/elementary/test_sys_notify.py
index f0a0812..86fd005 100644
--- a/examples/elementary/test_sys_notify.py
+++ b/examples/elementary/test_sys_notify.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 8from efl.elementary.box import Box
@@ -14,11 +15,6 @@ from efl.elementary.general import on_sys_notify_action_invoked, \
14 on_sys_notify_notification_closed, sys_notify_send 15 on_sys_notify_notification_closed, sys_notify_send
15from efl.ecore import ECORE_CALLBACK_DONE 16from efl.ecore import ECORE_CALLBACK_DONE
16 17
17EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
18EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
19FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
20FILL_HORIZ = EVAS_HINT_FILL, 0.5
21
22 18
23def _ev_handler(event, l, n): 19def _ev_handler(event, l, n):
24 print(event) 20 print(event)
diff --git a/examples/elementary/test_table.py b/examples/elementary/test_table.py
index 86f7ff2..974202b 100644
--- a/examples/elementary/test_table.py
+++ b/examples/elementary/test_table.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.background import Background 8from efl.elementary.background import Background
@@ -12,9 +13,6 @@ from efl.elementary.list import List
12from efl.elementary.label import Label 13from efl.elementary.label import Label
13from efl.elementary.frame import Frame 14from efl.elementary.frame import Frame
14 15
15EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
16EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
17FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
18 16
19def table_clicked(obj, item=None): 17def table_clicked(obj, item=None):
20 win = StandardWindow("table", "Table", autodel=True) 18 win = StandardWindow("table", "Table", autodel=True)
diff --git a/examples/elementary/test_thumb.py b/examples/elementary/test_thumb.py
index 6a02fa0..74c74b9 100644
--- a/examples/elementary/test_thumb.py
+++ b/examples/elementary/test_thumb.py
@@ -3,15 +3,13 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.scroller import Scroller 9from efl.elementary.scroller import Scroller
10from efl.elementary.table import Table 10from efl.elementary.table import Table
11from efl.elementary.thumb import Thumb 11from efl.elementary.thumb import Thumb
12 12
13EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
14FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
15 13
16script_path = os.path.dirname(os.path.abspath(__file__)) 14script_path = os.path.dirname(os.path.abspath(__file__))
17img_path = os.path.join(script_path, "images") 15img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_toolbar.py b/examples/elementary/test_toolbar.py
index 67f4372..d71d819 100644
--- a/examples/elementary/test_toolbar.py
+++ b/examples/elementary/test_toolbar.py
@@ -3,7 +3,7 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH
7from efl import elementary 7from efl import elementary
8from efl.elementary.window import StandardWindow 8from efl.elementary.window import StandardWindow
9from efl.elementary.box import Box 9from efl.elementary.box import Box
@@ -15,8 +15,6 @@ from efl.elementary.frame import Frame
15from efl.elementary.label import Label 15from efl.elementary.label import Label
16from efl.elementary.list import List 16from efl.elementary.list import List
17 17
18EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
19FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
20ALIGN_CENTER = 0.5, 0.5 18ALIGN_CENTER = 0.5, 0.5
21 19
22script_path = os.path.dirname(os.path.abspath(__file__)) 20script_path = os.path.dirname(os.path.abspath(__file__))
diff --git a/examples/elementary/test_tooltip.py b/examples/elementary/test_tooltip.py
index be8c5a9..4e38003 100644
--- a/examples/elementary/test_tooltip.py
+++ b/examples/elementary/test_tooltip.py
@@ -3,7 +3,8 @@
3 3
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
7from efl.ecore import Timer, timer_add 8from efl.ecore import Timer, timer_add
8from efl import elementary 9from efl import elementary
9from efl.elementary.window import StandardWindow 10from efl.elementary.window import StandardWindow
@@ -14,10 +15,6 @@ from efl.elementary.list import List
14from efl.elementary.toolbar import Toolbar 15from efl.elementary.toolbar import Toolbar
15from efl.elementary.icon import Icon 16from efl.elementary.icon import Icon
16 17
17EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
18EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
19FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
20FILL_HORIZ = EVAS_HINT_FILL, 0.5
21 18
22script_path = os.path.dirname(os.path.abspath(__file__)) 19script_path = os.path.dirname(os.path.abspath(__file__))
23img_path = os.path.join(script_path, "images") 20img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_transit.py b/examples/elementary/test_transit.py
index 3200cff..bd3ce20 100644
--- a/examples/elementary/test_transit.py
+++ b/examples/elementary/test_transit.py
@@ -4,7 +4,7 @@
4import os 4import os
5 5
6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 6from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
7 EVAS_ASPECT_CONTROL_VERTICAL 7 EVAS_ASPECT_CONTROL_VERTICAL, EXPAND_BOTH, FILL_BOTH
8from efl import elementary 8from efl import elementary
9from efl.elementary.button import Button 9from efl.elementary.button import Button
10from efl.elementary.window import StandardWindow 10from efl.elementary.window import StandardWindow
@@ -18,8 +18,6 @@ from efl.elementary.frame import Frame
18from efl.elementary.label import Label 18from efl.elementary.label import Label
19from efl.elementary.list import List 19from efl.elementary.list import List
20 20
21EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
22FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
23 21
24script_path = os.path.dirname(os.path.abspath(__file__)) 22script_path = os.path.dirname(os.path.abspath(__file__))
25img_path = os.path.join(script_path, "images") 23img_path = os.path.join(script_path, "images")
diff --git a/examples/elementary/test_video.py b/examples/elementary/test_video.py
index a1bc51d..3c0cd98 100644
--- a/examples/elementary/test_video.py
+++ b/examples/elementary/test_video.py
@@ -1,7 +1,7 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \ 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH, \
5 EVAS_CALLBACK_MOUSE_MOVE, EVAS_CALLBACK_MOUSE_IN, EVAS_CALLBACK_MOUSE_OUT 5 EVAS_CALLBACK_MOUSE_MOVE, EVAS_CALLBACK_MOUSE_IN, EVAS_CALLBACK_MOUSE_OUT
6from efl import elementary 6from efl import elementary
7from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
@@ -12,8 +12,6 @@ from efl.elementary.fileselector_button import FileselectorButton
12from efl.elementary.table import Table 12from efl.elementary.table import Table
13from efl.elementary.video import Video, Player 13from efl.elementary.video import Video, Player
14 14
15EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
16FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
17 15
18def my_bt_open(bt, vfile, video): 16def my_bt_open(bt, vfile, video):
19 if (vfile and video): 17 if (vfile and video):
diff --git a/examples/elementary/test_web.py b/examples/elementary/test_web.py
index 98ec635..2c1bcff 100644
--- a/examples/elementary/test_web.py
+++ b/examples/elementary/test_web.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import StandardWindow 7from efl.elementary.window import StandardWindow
7from efl.elementary.box import Box 8from efl.elementary.box import Box
@@ -9,11 +10,6 @@ from efl.elementary.button import Button
9from efl.elementary.entry import Entry 10from efl.elementary.entry import Entry
10from efl.elementary.web import Web 11from efl.elementary.web import Web
11 12
12EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
13EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
14FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
15FILL_HORIZ = EVAS_HINT_FILL, 0.5
16
17 13
18def web_clicked(obj): 14def web_clicked(obj):
19 if not elementary.need_web(): 15 if not elementary.need_web():
diff --git a/examples/elementary/test_win.py b/examples/elementary/test_win.py
index 366664d..8e2ca76 100644
--- a/examples/elementary/test_win.py
+++ b/examples/elementary/test_win.py
@@ -1,7 +1,8 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \
5 EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ
5from efl import elementary 6from efl import elementary
6from efl.elementary.window import Window, ELM_WIN_BASIC 7from efl.elementary.window import Window, ELM_WIN_BASIC
7from efl.elementary.background import Background 8from efl.elementary.background import Background
@@ -10,10 +11,6 @@ from efl.elementary.button import Button
10from efl.elementary.check import Check 11from efl.elementary.check import Check
11from efl.elementary.slider import Slider 12from efl.elementary.slider import Slider
12 13
13EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
14EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
15FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
16FILL_HORIZ = EVAS_HINT_FILL, 0.5
17 14
18def cb_alpha(bt, win, bg, on): 15def cb_alpha(bt, win, bg, on):
19 win.alpha = on 16 win.alpha = on
diff --git a/examples/elementary/test_win_dialog.py b/examples/elementary/test_win_dialog.py
index 45a4224..42b4356 100644
--- a/examples/elementary/test_win_dialog.py
+++ b/examples/elementary/test_win_dialog.py
@@ -1,15 +1,13 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# encoding: utf-8 2# encoding: utf-8
3 3
4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL 4from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH
5from efl import elementary 5from efl import elementary
6from efl.elementary.window import StandardWindow, DialogWindow 6from efl.elementary.window import StandardWindow, DialogWindow
7from efl.elementary.box import Box 7from efl.elementary.box import Box
8from efl.elementary.button import Button 8from efl.elementary.button import Button
9from efl.elementary.label import Label 9from efl.elementary.label import Label
10 10
11EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
12
13 11
14def clicked_cb(btn, parent): 12def clicked_cb(btn, parent):
15 dia = DialogWindow(parent, "window-dia", "DialogWindow", 13 dia = DialogWindow(parent, "window-dia", "DialogWindow",
diff --git a/include/efl.evas.pxd b/include/efl.evas.pxd
index 2b861c6..657178c 100644
--- a/include/efl.evas.pxd
+++ b/include/efl.evas.pxd
@@ -31,7 +31,7 @@ cdef extern from "Evas.h":
31 ctypedef unsigned long long Evas_Modifier_Mask 31 ctypedef unsigned long long Evas_Modifier_Mask
32 32
33 #################################################################### 33 ####################################################################
34 # #define (this are not really correct, but works) 34 # #define (this works only for integer define)
35 # 35 #
36 cpdef enum: 36 cpdef enum:
37 EVAS_LAYER_MIN 37 EVAS_LAYER_MIN
@@ -43,13 +43,10 @@ cdef extern from "Evas.h":
43 EVAS_TEXT_INVALID 43 EVAS_TEXT_INVALID
44 EVAS_TEXT_SPECIAL 44 EVAS_TEXT_SPECIAL
45 45
46 EVAS_HINT_EXPAND # ERROR expand to 1, should be 1.0
47 EVAS_HINT_FILL # ERROR expand to -1, should be -1.0
48
49 EVAS_SMART_CLASS_VERSION 46 EVAS_SMART_CLASS_VERSION
50 47
51 #################################################################### 48 ####################################################################
52 # Enums 49 # Enums (automatically exported to python scope)
53 # 50 #
54 cpdef enum Evas_Button_Flags: 51 cpdef enum Evas_Button_Flags:
55 EVAS_BUTTON_NONE 52 EVAS_BUTTON_NONE