forked from enlightenment/efl
ecore_cocoa: unify API with Ecore_Evas
- Sizes are signed integers - Width is named w - Height is named h Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
parent
0abeacb8ce
commit
71199709db
|
@ -215,28 +215,28 @@ EAPI void ecore_cocoa_window_size_get(const Ecore_Cocoa_Window *window,
|
||||||
int *h);
|
int *h);
|
||||||
|
|
||||||
EAPI void ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window,
|
EAPI void ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window,
|
||||||
unsigned int min_width,
|
int w,
|
||||||
unsigned int min_height);
|
int h);
|
||||||
|
|
||||||
EAPI void ecore_cocoa_window_size_min_get(const Ecore_Cocoa_Window *window,
|
EAPI void ecore_cocoa_window_size_min_get(const Ecore_Cocoa_Window *window,
|
||||||
unsigned int *min_width,
|
int *w,
|
||||||
unsigned int *min_height);
|
int *h);
|
||||||
|
|
||||||
EAPI void ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window,
|
EAPI void ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window,
|
||||||
unsigned int max_width,
|
int w,
|
||||||
unsigned int max_height);
|
int h);
|
||||||
|
|
||||||
EAPI void ecore_cocoa_window_size_max_get(const Ecore_Cocoa_Window *window,
|
EAPI void ecore_cocoa_window_size_max_get(const Ecore_Cocoa_Window *window,
|
||||||
unsigned int *max_width,
|
int *w,
|
||||||
unsigned int *max_height);
|
int *h);
|
||||||
|
|
||||||
EAPI void ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window,
|
EAPI void ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window,
|
||||||
unsigned int step_width,
|
int w,
|
||||||
unsigned int step_height);
|
int h);
|
||||||
|
|
||||||
EAPI void ecore_cocoa_window_size_step_get(const Ecore_Cocoa_Window *window,
|
EAPI void ecore_cocoa_window_size_step_get(const Ecore_Cocoa_Window *window,
|
||||||
unsigned int *step_width,
|
int *w,
|
||||||
unsigned int *step_height);
|
int *h);
|
||||||
|
|
||||||
EAPI void ecore_cocoa_window_show(Ecore_Cocoa_Window *window);
|
EAPI void ecore_cocoa_window_show(Ecore_Cocoa_Window *window);
|
||||||
|
|
||||||
|
|
|
@ -341,8 +341,8 @@ ecore_cocoa_window_free(Ecore_Cocoa_Window *window)
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window,
|
ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window,
|
||||||
unsigned int w,
|
int w,
|
||||||
unsigned int h)
|
int h)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN(window);
|
EINA_SAFETY_ON_NULL_RETURN(window);
|
||||||
|
|
||||||
|
@ -351,20 +351,20 @@ ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window,
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_cocoa_window_size_min_get(const Ecore_Cocoa_Window *window,
|
ecore_cocoa_window_size_min_get(const Ecore_Cocoa_Window *window,
|
||||||
unsigned int *min_width,
|
int *w,
|
||||||
unsigned int *min_height)
|
int *h)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN(window);
|
EINA_SAFETY_ON_NULL_RETURN(window);
|
||||||
|
|
||||||
const NSSize size = window->window.contentMinSize;
|
const NSSize size = window->window.contentMinSize;
|
||||||
if (min_width) *min_width = size.width;
|
if (w) *w = size.width;
|
||||||
if (min_height) *min_height = size.height;
|
if (h) *h = size.height;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window,
|
ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window,
|
||||||
unsigned int w,
|
int w,
|
||||||
unsigned int h)
|
int h)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN(window);
|
EINA_SAFETY_ON_NULL_RETURN(window);
|
||||||
|
|
||||||
|
@ -373,20 +373,20 @@ ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window,
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_cocoa_window_size_max_get(const Ecore_Cocoa_Window *window,
|
ecore_cocoa_window_size_max_get(const Ecore_Cocoa_Window *window,
|
||||||
unsigned int *max_width,
|
int *w,
|
||||||
unsigned int *max_height)
|
int *h)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN(window);
|
EINA_SAFETY_ON_NULL_RETURN(window);
|
||||||
|
|
||||||
const NSSize size = window->window.contentMaxSize;
|
const NSSize size = window->window.contentMaxSize;
|
||||||
if (max_width) *max_width = size.width;
|
if (w) *w = size.width;
|
||||||
if (max_height) *max_height = size.height;
|
if (h) *h = size.height;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window,
|
ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window,
|
||||||
unsigned int w,
|
int w,
|
||||||
unsigned int h)
|
int h)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN(window);
|
EINA_SAFETY_ON_NULL_RETURN(window);
|
||||||
|
|
||||||
|
@ -395,14 +395,14 @@ ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window,
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_cocoa_window_size_step_get(const Ecore_Cocoa_Window *window,
|
ecore_cocoa_window_size_step_get(const Ecore_Cocoa_Window *window,
|
||||||
unsigned int *step_width,
|
int *w,
|
||||||
unsigned int *step_height)
|
int *h)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN(window);
|
EINA_SAFETY_ON_NULL_RETURN(window);
|
||||||
|
|
||||||
const NSSize size = window->window.contentResizeIncrements;
|
const NSSize size = window->window.contentResizeIncrements;
|
||||||
if (step_width) *step_width = size.width;
|
if (w) *w = size.width;
|
||||||
if (step_height) *step_height = size.height;
|
if (h) *h = size.height;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
@ -470,17 +470,17 @@ EAPI void
|
||||||
ecore_cocoa_window_move_resize(Ecore_Cocoa_Window *window,
|
ecore_cocoa_window_move_resize(Ecore_Cocoa_Window *window,
|
||||||
int x,
|
int x,
|
||||||
int y,
|
int y,
|
||||||
int width,
|
int w,
|
||||||
int height)
|
int h)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN(window);
|
EINA_SAFETY_ON_NULL_RETURN(window);
|
||||||
|
|
||||||
NSRect win_frame;
|
NSRect win_frame;
|
||||||
|
|
||||||
win_frame = [window->window frame];
|
win_frame = [window->window frame];
|
||||||
win_frame.size.height = height +
|
win_frame.size.height = h +
|
||||||
(([window->window isFullScreen] == YES) ? 0 : ecore_cocoa_titlebar_height_get());
|
(([window->window isFullScreen] == YES) ? 0 : ecore_cocoa_titlebar_height_get());
|
||||||
win_frame.size.width = width;
|
win_frame.size.width = w;
|
||||||
win_frame.origin.x = x;
|
win_frame.origin.x = x;
|
||||||
win_frame.origin.y = y;
|
win_frame.origin.y = y;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue