cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ca3bd69485f2c8c49a7a121bcb32b7862736a2e4
commit ca3bd69485f2c8c49a7a121bcb32b7862736a2e4 Author: pierre lamot <[email protected]> Date: Wed Mar 11 15:31:36 2015 +0100 ecore_cocoa: add functions to allow min/max window size Signed-off-by: Cedric BAIL <[email protected]> --- src/lib/ecore_cocoa/ecore_cocoa_window.m | 33 ++++++++++++++++++++++ .../ecore_evas/engines/cocoa/ecore_evas_cocoa.c | 24 ++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m index 2586087..b231106 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_window.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m @@ -293,6 +293,39 @@ ecore_cocoa_window_free(Ecore_Cocoa_Window *window) } void +ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window, + unsigned int w, + unsigned int h) +{ + if (!window) + return; + NSSize size = {w,h}; + window->window.contentMinSize = size; +} + +void +ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window, + unsigned int w, + unsigned int h) +{ + if (!window) + return; + NSSize size = {w,h}; + window->window.contentMaxSize = size; +} + +void +ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window, + unsigned int w, + unsigned int h) +{ + if (!window) + return; + NSSize size = {w,h}; + window->window.contentResizeIncrements = size; +} + +void ecore_cocoa_window_move(Ecore_Cocoa_Window *window, int x, int y) diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c index 1dc290b..5adf742 100644 --- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c +++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c @@ -303,6 +303,24 @@ _ecore_evas_cocoa_free(Ecore_Evas *ee) } static void +_ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h) +{ + ecore_cocoa_window_size_min_set((Ecore_Cocoa_Window *)ee->prop.window, w, h); +} + +static void +_ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h) +{ + ecore_cocoa_window_size_max_set((Ecore_Cocoa_Window *)ee->prop.window, w, h); +} + +static void +_ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h) +{ + ecore_cocoa_window_size_step_set((Ecore_Cocoa_Window *)ee->prop.window, w, h); +} + +static void _ecore_evas_resize(Ecore_Evas *ee, int w, int h) { DBG("Resize"); @@ -524,10 +542,10 @@ static Ecore_Evas_Engine_Func _ecore_cocoa_engine_func = NULL, //activate _ecore_evas_title_set, NULL, + _ecore_evas_size_min_set, + _ecore_evas_size_max_set, NULL, - NULL, - NULL, - NULL, + _ecore_evas_size_step_set, _ecore_evas_object_cursor_set, _ecore_evas_object_cursor_unset, NULL, --
