summaryrefslogtreecommitdiff
path: root/reference
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-03-04 18:17:36 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-03-04 18:17:36 +0100
commit3e1aefa7ea74750cd6b1669c61fe02ef2aef8a90 (patch)
treeb2c55104321ce02469f0dc33e69de15c07e72497 /reference
parentd16b7e48bc8a4a8d9cfc3cac2ab574a0c374f401 (diff)
Further fixes to adapt to latest API changes
Diffstat (limited to 'reference')
-rw-r--r--reference/c/core/src/core_io.c4
-rw-r--r--reference/c/ui/src/ui_sizing.c2
-rw-r--r--reference/csharp/ui/src/focus_main.cs7
-rw-r--r--reference/csharp/ui/src/ui_container.cs9
-rw-r--r--reference/csharp/ui/src/ui_sizing.cs9
5 files changed, 17 insertions, 14 deletions
diff --git a/reference/c/core/src/core_io.c b/reference/c/core/src/core_io.c
index dbfcca15..68fd9c08 100644
--- a/reference/c/core/src/core_io.c
+++ b/reference/c/core/src/core_io.c
@@ -22,7 +22,7 @@ _io_write(const char *filename)
22 Efl_Io_File *file; 22 Efl_Io_File *file;
23 23
24 file = efl_new(EFL_IO_FILE_CLASS, 24 file = efl_new(EFL_IO_FILE_CLASS,
25 efl_file_set(efl_added, filename, NULL), // mandatory 25 efl_file_set(efl_added, filename), // mandatory
26 efl_io_file_flags_set(efl_added, O_WRONLY | O_CREAT), // write and create - default is read 26 efl_io_file_flags_set(efl_added, O_WRONLY | O_CREAT), // write and create - default is read
27 efl_io_file_mode_set(efl_added, 0644), // neccessary if we use O_CREAT 27 efl_io_file_mode_set(efl_added, 0644), // neccessary if we use O_CREAT
28 efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE)); // recommended 28 efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE)); // recommended
@@ -51,7 +51,7 @@ _io_read(const char *filename)
51 Efl_Io_File *file; 51 Efl_Io_File *file;
52 52
53 file = efl_new(EFL_IO_FILE_CLASS, 53 file = efl_new(EFL_IO_FILE_CLASS,
54 efl_file_set(efl_added, filename, NULL), // mandatory 54 efl_file_set(efl_added, filename), // mandatory
55 efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE)); // recommended 55 efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE)); // recommended
56 56
57 if (!file) 57 if (!file)
diff --git a/reference/c/ui/src/ui_sizing.c b/reference/c/ui/src/ui_sizing.c
index 80e50b51..129a7e56 100644
--- a/reference/c/ui/src/ui_sizing.c
+++ b/reference/c/ui/src/ui_sizing.c
@@ -50,7 +50,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
50 efl_add(EFL_UI_BUTTON_CLASS, win, 50 efl_add(EFL_UI_BUTTON_CLASS, win,
51 efl_text_set(efl_added, "Big Button"), 51 efl_text_set(efl_added, "Big Button"),
52 efl_pack_end(box, efl_added), 52 efl_pack_end(box, efl_added),
53 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 100))); 53 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 100)));
54 54
55 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 320)); 55 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 320));
56} 56}
diff --git a/reference/csharp/ui/src/focus_main.cs b/reference/csharp/ui/src/focus_main.cs
index 700172f0..a8d26156 100644
--- a/reference/csharp/ui/src/focus_main.cs
+++ b/reference/csharp/ui/src/focus_main.cs
@@ -20,15 +20,16 @@ public class Example
20 win.SetWinType(Efl.Ui.WinType.Basic); 20 win.SetWinType(Efl.Ui.WinType.Basic);
21 win.SetText("Focus example"); 21 win.SetText("Focus example");
22 win.SetAutohide(true); 22 win.SetAutohide(true);
23 win.HideEvt += (object sender, EventArgs e) => { 23 win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => {
24 // Exit the EFL main loop 24 // Exit the EFL main loop
25 Efl.Ui.Config.Exit(); 25 if (e.arg == false)
26 Efl.Ui.Config.Exit();
26 }; 27 };
27 28
28 29
29 // Create the main box container 30 // Create the main box container
30 var vbox = new Efl.Ui.Box(win); 31 var vbox = new Efl.Ui.Box(win);
31 vbox.SetHintMin(new Eina.Size2D(360, 240)); 32 vbox.SetHintSizeMin(new Eina.Size2D(360, 240));
32 win.SetContent(vbox); 33 win.SetContent(vbox);
33 34
34 // Create some check boxes 35 // Create some check boxes
diff --git a/reference/csharp/ui/src/ui_container.cs b/reference/csharp/ui/src/ui_container.cs
index 88dc3d03..8b611f14 100644
--- a/reference/csharp/ui/src/ui_container.cs
+++ b/reference/csharp/ui/src/ui_container.cs
@@ -24,7 +24,7 @@ public class Example
24 if (i == 2) 24 if (i == 2)
25 { 25 {
26 // Button 2 has its maximum size limited, so it will be smaller 26 // Button 2 has its maximum size limited, so it will be smaller
27 button.SetHintMax(new Eina.Size2D(100,50)); 27 button.SetHintSizeMax(new Eina.Size2D(100,50));
28 } 28 }
29 box.DoPack(button); 29 box.DoPack(button);
30 } 30 }
@@ -70,9 +70,10 @@ public class Example
70 win.SetWinType(Efl.Ui.WinType.Basic); 70 win.SetWinType(Efl.Ui.WinType.Basic);
71 win.SetText("Container demo"); 71 win.SetText("Container demo");
72 win.SetAutohide(true); 72 win.SetAutohide(true);
73 win.HideEvt += (object sender, EventArgs e) => { 73 win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => {
74 // Exit the EFL main loop 74 // Exit the EFL main loop
75 Efl.Ui.Config.Exit(); 75 if (e.arg == false)
76 Efl.Ui.Config.Exit();
76 }; 77 };
77 // Give the window an initial size so there is room to resize the panes. 78 // Give the window an initial size so there is room to resize the panes.
78 // Otherwise, all widgets are tightly packed 79 // Otherwise, all widgets are tightly packed
@@ -103,7 +104,7 @@ public class Example
103 // container 104 // container
104 Efl.Ui.Button quit_btn = new Efl.Ui.Button(win); 105 Efl.Ui.Button quit_btn = new Efl.Ui.Button(win);
105 quit_btn.SetText("Quit"); 106 quit_btn.SetText("Quit");
106 quit_btn.SetHintMax(new Eina.Size2D(150, 30)); 107 quit_btn.SetHintSizeMax(new Eina.Size2D(150, 30));
107 quit_btn.ClickedEvt += (object sender, EventArgs e) => { 108 quit_btn.ClickedEvt += (object sender, EventArgs e) => {
108 // Exit the EFL main loop 109 // Exit the EFL main loop
109 Efl.Ui.Config.Exit(); 110 Efl.Ui.Config.Exit();
diff --git a/reference/csharp/ui/src/ui_sizing.cs b/reference/csharp/ui/src/ui_sizing.cs
index ac25283e..c8cdf901 100644
--- a/reference/csharp/ui/src/ui_sizing.cs
+++ b/reference/csharp/ui/src/ui_sizing.cs
@@ -23,9 +23,10 @@ public class Example
23 win.SetWinType(Efl.Ui.WinType.Basic); 23 win.SetWinType(Efl.Ui.WinType.Basic);
24 win.SetText("Size Control"); 24 win.SetText("Size Control");
25 win.SetAutohide(true); 25 win.SetAutohide(true);
26 win.HideEvt += (object sender, EventArgs e) => { 26 win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => {
27 // Exit the EFL main loop 27 // Exit the EFL main loop
28 Efl.Ui.Config.Exit(); 28 if (e.arg == false)
29 Efl.Ui.Config.Exit();
29 }; 30 };
30 31
31 // Create a box container 32 // Create a box container
@@ -40,13 +41,13 @@ public class Example
40 // Create a small button (max size is limited) 41 // Create a small button (max size is limited)
41 button = new Efl.Ui.Button(win); 42 button = new Efl.Ui.Button(win);
42 button.SetText("Small"); 43 button.SetText("Small");
43 button.SetHintMax(new Eina.Size2D(50,50)); 44 button.SetHintSizeMax(new Eina.Size2D(50,50));
44 box.DoPack(button); 45 box.DoPack(button);
45 46
46 // Create a big button (min size is limited) 47 // Create a big button (min size is limited)
47 button = new Efl.Ui.Button(win); 48 button = new Efl.Ui.Button(win);
48 button.SetText("Big button"); 49 button.SetText("Big button");
49 button.SetHintMin(new Eina.Size2D(100,100)); 50 button.SetHintSizeMin(new Eina.Size2D(100,100));
50 box.DoPack(button); 51 box.DoPack(button);
51 52
52 // Start the EFL main loop 53 // Start the EFL main loop