summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_window.m33
-rw-r--r--src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c24
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 25860872a6..b231106904 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)
293} 293}
294 294
295void 295void
296ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window,
297 unsigned int w,
298 unsigned int h)
299{
300 if (!window)
301 return;
302 NSSize size = {w,h};
303 window->window.contentMinSize = size;
304}
305
306void
307ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window,
308 unsigned int w,
309 unsigned int h)
310{
311 if (!window)
312 return;
313 NSSize size = {w,h};
314 window->window.contentMaxSize = size;
315}
316
317void
318ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window,
319 unsigned int w,
320 unsigned int h)
321{
322 if (!window)
323 return;
324 NSSize size = {w,h};
325 window->window.contentResizeIncrements = size;
326}
327
328void
296ecore_cocoa_window_move(Ecore_Cocoa_Window *window, 329ecore_cocoa_window_move(Ecore_Cocoa_Window *window,
297 int x, 330 int x,
298 int y) 331 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 1dc290b51b..5adf742bf9 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)
303} 303}
304 304
305static void 305static void
306_ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h)
307{
308 ecore_cocoa_window_size_min_set((Ecore_Cocoa_Window *)ee->prop.window, w, h);
309}
310
311static void
312_ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h)
313{
314 ecore_cocoa_window_size_max_set((Ecore_Cocoa_Window *)ee->prop.window, w, h);
315}
316
317static void
318_ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h)
319{
320 ecore_cocoa_window_size_step_set((Ecore_Cocoa_Window *)ee->prop.window, w, h);
321}
322
323static void
306_ecore_evas_resize(Ecore_Evas *ee, int w, int h) 324_ecore_evas_resize(Ecore_Evas *ee, int w, int h)
307{ 325{
308 DBG("Resize"); 326 DBG("Resize");
@@ -524,10 +542,10 @@ static Ecore_Evas_Engine_Func _ecore_cocoa_engine_func =
524 NULL, //activate 542 NULL, //activate
525 _ecore_evas_title_set, 543 _ecore_evas_title_set,
526 NULL, 544 NULL,
545 _ecore_evas_size_min_set,
546 _ecore_evas_size_max_set,
527 NULL, 547 NULL,
528 NULL, 548 _ecore_evas_size_step_set,
529 NULL,
530 NULL,
531 _ecore_evas_object_cursor_set, 549 _ecore_evas_object_cursor_set,
532 _ecore_evas_object_cursor_unset, 550 _ecore_evas_object_cursor_unset,
533 NULL, 551 NULL,