summaryrefslogtreecommitdiff
path: root/src/lib/ecore_cocoa
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean@guyomarch.bzh>2017-03-08 22:06:35 +0100
committerJean Guyomarc'h <jean@guyomarch.bzh>2017-03-09 00:57:55 +0100
commit88e352efe826624c35033a0880c7654b548bbe4a (patch)
treecf9c0769db1e031bb68554193e7ee9832b1f70f6 /src/lib/ecore_cocoa
parent79e7e2628a881540f35b64f515938b31a136c674 (diff)
ecore_cocoa: pass the right window to ecore_evas
Diffstat (limited to 'src/lib/ecore_cocoa')
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_window.m14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m
index 249c0a8051..716fc64980 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_window.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m
@@ -68,13 +68,13 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
68 event->w = size.width; 68 event->w = size.width;
69 event->h = size.height - 69 event->h = size.height -
70 (([self isFullScreen] == YES) ? 0 : ecore_cocoa_titlebar_height_get()); 70 (([self isFullScreen] == YES) ? 0 : ecore_cocoa_titlebar_height_get());
71 event->cocoa_window = self; 71 event->cocoa_window = self.ecore_window_data;
72 ecore_event_add(ECORE_COCOA_EVENT_WINDOW_RESIZE_REQUEST, event, NULL, NULL); 72 ecore_event_add(ECORE_COCOA_EVENT_WINDOW_RESIZE_REQUEST, event, NULL, NULL);
73 73
74 return YES; 74 return YES;
75} 75}
76 76
77- (void)windowWillClose:(NSNotification *) notification 77- (void)windowWillClose:(NSNotification *) EINA_UNUSED notif
78{ 78{
79 Ecore_Cocoa_Event_Window_Destroy *event; 79 Ecore_Cocoa_Event_Window_Destroy *event;
80 80
@@ -84,7 +84,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
84 CRI("Failed to allocate Ecore_Cocoa_Event_Window"); 84 CRI("Failed to allocate Ecore_Cocoa_Event_Window");
85 return; 85 return;
86 } 86 }
87 event->cocoa_window = [notification object]; 87 event->cocoa_window = self.ecore_window_data;
88 ecore_event_add(ECORE_COCOA_EVENT_WINDOW_DESTROY, event, NULL, NULL); 88 ecore_event_add(ECORE_COCOA_EVENT_WINDOW_DESTROY, event, NULL, NULL);
89} 89}
90 90
@@ -122,7 +122,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
122 } 122 }
123} 123}
124 124
125- (void)windowDidBecomeKey:(NSNotification *)notification 125- (void)windowDidBecomeKey:(NSNotification *) EINA_UNUSED notif
126{ 126{
127 Ecore_Cocoa_Event_Window_Focused *e; 127 Ecore_Cocoa_Event_Window_Focused *e;
128 128
@@ -132,7 +132,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
132 CRI("Failed to allocate Ecore_Cocoa_Event_Window"); 132 CRI("Failed to allocate Ecore_Cocoa_Event_Window");
133 return; 133 return;
134 } 134 }
135 e->cocoa_window = [notification object]; 135 e->cocoa_window = self.ecore_window_data;
136 ecore_event_add(ECORE_COCOA_EVENT_WINDOW_FOCUSED, e, NULL, NULL); 136 ecore_event_add(ECORE_COCOA_EVENT_WINDOW_FOCUSED, e, NULL, NULL);
137} 137}
138 138
@@ -150,7 +150,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
150 [NSApp resumeNSRunLoopMonitoring]; 150 [NSApp resumeNSRunLoopMonitoring];
151} 151}
152 152
153- (void)windowDidResignKey:(NSNotification *)notification 153- (void)windowDidResignKey:(NSNotification *) EINA_UNUSED notif
154{ 154{
155 Ecore_Cocoa_Event_Window_Unfocused *e; 155 Ecore_Cocoa_Event_Window_Unfocused *e;
156 156
@@ -160,7 +160,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
160 CRI("Failed to allocate Ecore_Cocoa_Event_Window"); 160 CRI("Failed to allocate Ecore_Cocoa_Event_Window");
161 return; 161 return;
162 } 162 }
163 e->cocoa_window = [notification object]; 163 e->cocoa_window = self.ecore_window_data;
164 ecore_event_add(ECORE_COCOA_EVENT_WINDOW_UNFOCUSED, e, NULL, NULL); 164 ecore_event_add(ECORE_COCOA_EVENT_WINDOW_UNFOCUSED, e, NULL, NULL);
165} 165}
166 166