From 5deb157770ea2e5fc422725a263c5a73e4fb4d93 Mon Sep 17 00:00:00 2001 From: Jean Guyomarc'h Date: Tue, 5 Jan 2016 23:47:30 +0100 Subject: [PATCH] ecore_cocoa: implement and const-correct window size getter Signed-off-by: Cedric BAIL --- src/lib/ecore_cocoa/Ecore_Cocoa.h | 6 +++--- src/lib/ecore_cocoa/ecore_cocoa_window.m | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h index cad972d6e4..7b499acff2 100644 --- a/src/lib/ecore_cocoa/Ecore_Cocoa.h +++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h @@ -204,9 +204,9 @@ EAPI void ecore_cocoa_window_geometry_get(const Ecore_Cocoa_Window *window, int *w, int *h); -EAPI void ecore_cocoa_window_size_get(Ecore_Cocoa_Window *window, - int *width, - int *height); +EAPI void ecore_cocoa_window_size_get(const Ecore_Cocoa_Window *window, + int *w, + int *h); EAPI void ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window, unsigned int min_width, diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m index 61bbacb03f..4fcd8b517e 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_window.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m @@ -418,6 +418,18 @@ ecore_cocoa_window_geometry_get(const Ecore_Cocoa_Window *window, if (h) *h = frame.size.height; } +EAPI void +ecore_cocoa_window_size_get(const Ecore_Cocoa_Window *window, + int *w, + int *h) +{ + EINA_SAFETY_ON_NULL_RETURN(window); + + const NSSize size = window->window.frame.size; + if (w) *w = size.width; + if (h) *h = size.height; +} + EAPI void ecore_cocoa_window_move_resize(Ecore_Cocoa_Window *window, int x,