xartigas pushed a commit to branch master. http://git.enlightenment.org/tools/examples.git/commit/?id=3e1aefa7ea74750cd6b1669c61fe02ef2aef8a90
commit 3e1aefa7ea74750cd6b1669c61fe02ef2aef8a90 Author: Xavi Artigas <[email protected]> Date: Mon Mar 4 18:17:36 2019 +0100 Further fixes to adapt to latest API changes --- apps/c/texteditor/src/texteditor_main.c | 2 +- apps/csharp/life/src/life_main.cs | 9 +++++---- apps/csharp/texteditor/src/texteditor_main.cs | 17 +++++++++-------- reference/c/core/src/core_io.c | 4 ++-- reference/c/ui/src/ui_sizing.c | 2 +- reference/csharp/ui/src/focus_main.cs | 7 ++++--- reference/csharp/ui/src/ui_container.cs | 9 +++++---- reference/csharp/ui/src/ui_sizing.cs | 9 +++++---- tutorial/csharp/hello-gui/src/gui_main.cs | 11 ++++++----- 9 files changed, 38 insertions(+), 32 deletions(-) diff --git a/apps/c/texteditor/src/texteditor_main.c b/apps/c/texteditor/src/texteditor_main.c index 80853030..66bcc42d 100644 --- a/apps/c/texteditor/src/texteditor_main.c +++ b/apps/c/texteditor/src/texteditor_main.c @@ -106,9 +106,9 @@ _gui_setup() efl_text_font_set(efl_added, "Mono", 14), efl_text_multiline_set(efl_added, EINA_TRUE), efl_text_interactive_editable_set(efl_added, EINA_TRUE), - efl_ui_text_scrollable_set(efl_added, EINA_TRUE), efl_event_callback_array_add(efl_added, _editor_callbacks(), NULL), efl_pack(box, efl_added)); + efl_ui_text_scrollable_set(_editor, EINA_TRUE); } EAPI_MAIN void diff --git a/apps/csharp/life/src/life_main.cs b/apps/csharp/life/src/life_main.cs index 07dd43ab..a7c67771 100644 --- a/apps/csharp/life/src/life_main.cs +++ b/apps/csharp/life/src/life_main.cs @@ -10,10 +10,11 @@ public class LifeWindow lifeRender.RenderLayout((Efl.Ui.Win)sender); } - void QuitEvt(object sender, EventArgs ev) + void QuitEvt(object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args ev) { // quit the mainloop - Efl.Ui.Config.Exit(); + if (ev.arg == false) + Efl.Ui.Config.Exit(); } void TouchEvt(object sender, Efl.Input.InterfacePointerDownEvt_Args ev) @@ -42,7 +43,7 @@ public class LifeWindow win.SetAutohide(true); // when the user clicks "close" on a window there is a request to hide - ((Efl.Gfx.Entity)win).HideEvt += QuitEvt; + ((Efl.Gfx.Entity)win).VisibilityChangedEvt += QuitEvt; Eina.Size2D sz; sz.W = (int)(10 * LifeBoard.Width * win.GetScale()); @@ -52,7 +53,7 @@ public class LifeWindow lifeRender = new LifeRender(win, lifeBoard); lifeRender.Refresh(win); - ((Efl.Gfx.Entity)win).ResizeEvt += ResizeEvt; + ((Efl.Gfx.Entity)win).SizeChangedEvt += ResizeEvt; ((Efl.Input.Interface)win).PointerDownEvt += TouchEvt; ((Efl.Input.Interface)win).KeyDownEvt += KeyDownEvt; diff --git a/apps/csharp/texteditor/src/texteditor_main.cs b/apps/csharp/texteditor/src/texteditor_main.cs index 9793a5bc..f6972451 100644 --- a/apps/csharp/texteditor/src/texteditor_main.cs +++ b/apps/csharp/texteditor/src/texteditor_main.cs @@ -32,9 +32,10 @@ public class TextEditor "texteditor_example.txt"); // Quits the application - private void GUIQuitCb(object sender, EventArgs ea) + private void GUIQuitCb(object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args ea) { - Efl.Ui.Config.Exit(); + if (ea.arg == false) + Efl.Ui.Config.Exit(); } // Enables or disables buttons on the toolbar as required @@ -146,7 +147,7 @@ public class TextEditor bar.DoPack(box); // "Quit" button - GUIToolbarButtonAdd(bar, "Quit", "application-exit", GUIQuitCb); + GUIToolbarButtonAdd(bar, "Quit", "application-exit", (object sender, EventArgs e) => { Efl.Ui.Config.Exit(); } ); } // Builds the user interface for the text editor @@ -156,7 +157,7 @@ public class TextEditor win = new Efl.Ui.Win(parent: Efl.App.AppMain); win.SetText("Text Editor"); win.SetAutohide(true); - win.HideEvt += GUIQuitCb; + win.VisibilityChangedEvt += GUIQuitCb; // Create a vertical box container Efl.Ui.Box box = new Efl.Ui.Box(win); @@ -168,10 +169,10 @@ public class TextEditor // Create the main text entry editorTextBox = new Efl.Ui.Text(box); editorTextBox.SetFont("Mono", 14); - editorTextBox.SetMultiline(true); - editorTextBox.SetEditable(true); - editorTextBox.SetScrollable(true); - editorTextBox.SetHintMin(new Eina.Size2D(360, 240)); + editorTextBox.Multiline = true; + editorTextBox.Editable = true; + editorTextBox.Scrollable = true; + editorTextBox.SetHintSizeMin(new Eina.Size2D(360, 240)); editorTextBox.ChangedEvt += EditorChangedCb; editorTextBox.ChangedUserEvt += EditorChangedCb; box.DoPack(editorTextBox); 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) Efl_Io_File *file; file = efl_new(EFL_IO_FILE_CLASS, - efl_file_set(efl_added, filename, NULL), // mandatory + efl_file_set(efl_added, filename), // mandatory efl_io_file_flags_set(efl_added, O_WRONLY | O_CREAT), // write and create - default is read efl_io_file_mode_set(efl_added, 0644), // neccessary if we use O_CREAT efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE)); // recommended @@ -51,7 +51,7 @@ _io_read(const char *filename) Efl_Io_File *file; file = efl_new(EFL_IO_FILE_CLASS, - efl_file_set(efl_added, filename, NULL), // mandatory + efl_file_set(efl_added, filename), // mandatory efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE)); // recommended 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) efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Big Button"), efl_pack_end(box, efl_added), - efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 100))); + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 100))); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 320)); } 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 win.SetWinType(Efl.Ui.WinType.Basic); win.SetText("Focus example"); win.SetAutohide(true); - win.HideEvt += (object sender, EventArgs e) => { + win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => { // Exit the EFL main loop - Efl.Ui.Config.Exit(); + if (e.arg == false) + Efl.Ui.Config.Exit(); }; // Create the main box container var vbox = new Efl.Ui.Box(win); - vbox.SetHintMin(new Eina.Size2D(360, 240)); + vbox.SetHintSizeMin(new Eina.Size2D(360, 240)); win.SetContent(vbox); // 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 if (i == 2) { // Button 2 has its maximum size limited, so it will be smaller - button.SetHintMax(new Eina.Size2D(100,50)); + button.SetHintSizeMax(new Eina.Size2D(100,50)); } box.DoPack(button); } @@ -70,9 +70,10 @@ public class Example win.SetWinType(Efl.Ui.WinType.Basic); win.SetText("Container demo"); win.SetAutohide(true); - win.HideEvt += (object sender, EventArgs e) => { + win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => { // Exit the EFL main loop - Efl.Ui.Config.Exit(); + if (e.arg == false) + Efl.Ui.Config.Exit(); }; // Give the window an initial size so there is room to resize the panes. // Otherwise, all widgets are tightly packed @@ -103,7 +104,7 @@ public class Example // container Efl.Ui.Button quit_btn = new Efl.Ui.Button(win); quit_btn.SetText("Quit"); - quit_btn.SetHintMax(new Eina.Size2D(150, 30)); + quit_btn.SetHintSizeMax(new Eina.Size2D(150, 30)); quit_btn.ClickedEvt += (object sender, EventArgs e) => { // Exit the EFL main loop 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 win.SetWinType(Efl.Ui.WinType.Basic); win.SetText("Size Control"); win.SetAutohide(true); - win.HideEvt += (object sender, EventArgs e) => { + win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => { // Exit the EFL main loop - Efl.Ui.Config.Exit(); + if (e.arg == false) + Efl.Ui.Config.Exit(); }; // Create a box container @@ -40,13 +41,13 @@ public class Example // Create a small button (max size is limited) button = new Efl.Ui.Button(win); button.SetText("Small"); - button.SetHintMax(new Eina.Size2D(50,50)); + button.SetHintSizeMax(new Eina.Size2D(50,50)); box.DoPack(button); // Create a big button (min size is limited) button = new Efl.Ui.Button(win); button.SetText("Big button"); - button.SetHintMin(new Eina.Size2D(100,100)); + button.SetHintSizeMin(new Eina.Size2D(100,100)); box.DoPack(button); // Start the EFL main loop diff --git a/tutorial/csharp/hello-gui/src/gui_main.cs b/tutorial/csharp/hello-gui/src/gui_main.cs index 8a304304..2f50745e 100644 --- a/tutorial/csharp/hello-gui/src/gui_main.cs +++ b/tutorial/csharp/hello-gui/src/gui_main.cs @@ -3,10 +3,11 @@ using System; public class Example { // Callback to quit the application - public static void QuitCb(object sender, EventArgs e) + public static void QuitCb(object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) { // Exit the EFL main loop - Efl.Ui.Config.Exit(); + if (e.arg == false) + Efl.Ui.Config.Exit(); } #if WIN32 @@ -25,12 +26,12 @@ public class Example // button is pressed win.SetAutohide(true); // Hook to the Hide event - win.HideEvt += QuitCb; + win.VisibilityChangedEvt += QuitCb; // Create a box container var box = new Efl.Ui.Box(win); // Set its minimum size - box.SetHintMin(new Eina.Size2D(360, 240)); + box.SetHintSizeMin(new Eina.Size2D(360, 540)); // Set the box as the content for the window // The window size will adapt to the box size win.SetContent(box); @@ -51,7 +52,7 @@ public class Example button.SetText("Quit"); button.SetHintWeight(1.0, 0.1); // Set the method to be called when the button is pressed - button.ClickedEvt += QuitCb; + button.ClickedEvt += (object sender, EventArgs e) => { Efl.Ui.Config.Exit(); }; // Add the button to the box container box.DoPack(button); --
