simplify mouse code a little
This commit is contained in:
parent
10b8d633d0
commit
e67d717c4e
|
@ -170,20 +170,12 @@ final class MacOSXDisplay implements DisplayImplementation {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void mouseInsideWindow() {
|
public void mouseInsideWindow(boolean inside) {
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
mouseInsideWindow = true;
|
mouseInsideWindow = inside;
|
||||||
}
|
}
|
||||||
updateNativeCursor = true;
|
updateNativeCursor = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void mouseOutsideWindow() {
|
|
||||||
synchronized (this) {
|
|
||||||
mouseInsideWindow = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
updateNativeCursor = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public native void nDestroyCALayer(ByteBuffer peer_info_handle);
|
public native void nDestroyCALayer(ByteBuffer peer_info_handle);
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ static MacOSXPeerInfo *peer_info;
|
||||||
|
|
||||||
+ (void) createWindow {
|
+ (void) createWindow {
|
||||||
MacOSXWindowInfo *window_info = peer_info->window_info;
|
MacOSXWindowInfo *window_info = peer_info->window_info;
|
||||||
//
|
|
||||||
int width = window_info->display_rect.size.width;
|
int width = window_info->display_rect.size.width;
|
||||||
int height = window_info->display_rect.size.height;
|
int height = window_info->display_rect.size.height;
|
||||||
|
|
||||||
|
@ -476,8 +476,8 @@ static MacOSXPeerInfo *peer_info;
|
||||||
}
|
}
|
||||||
|
|
||||||
jclass display_class = (*env)->GetObjectClass(env, _parent->jdisplay);
|
jclass display_class = (*env)->GetObjectClass(env, _parent->jdisplay);
|
||||||
jmethodID mouseInsideWindow_callback = (*env)->GetMethodID(env, display_class, "mouseInsideWindow", "()V");
|
jmethodID mouseInsideWindow_callback = (*env)->GetMethodID(env, display_class, "mouseInsideWindow", "(Z)V");
|
||||||
(*env)->CallVoidMethod(env, _parent->jdisplay, mouseInsideWindow_callback);
|
(*env)->CallVoidMethod(env, _parent->jdisplay, mouseInsideWindow_callback, JNI_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
-(void)mouseExited:(NSEvent *)event {
|
-(void)mouseExited:(NSEvent *)event {
|
||||||
|
@ -487,8 +487,8 @@ static MacOSXPeerInfo *peer_info;
|
||||||
}
|
}
|
||||||
|
|
||||||
jclass display_class = (*env)->GetObjectClass(env, _parent->jdisplay);
|
jclass display_class = (*env)->GetObjectClass(env, _parent->jdisplay);
|
||||||
jmethodID mouseOutsideWindow_callback = (*env)->GetMethodID(env, display_class, "mouseOutsideWindow", "()V");
|
jmethodID mouseInsideWindow_callback = (*env)->GetMethodID(env, display_class, "mouseInsideWindow", "(Z)V");
|
||||||
(*env)->CallVoidMethod(env, _parent->jdisplay, mouseOutsideWindow_callback);
|
(*env)->CallVoidMethod(env, _parent->jdisplay, mouseInsideWindow_callback, JNI_FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) drawRect:(NSRect)rect {
|
- (void) drawRect:(NSRect)rect {
|
||||||
|
|
Loading…
Reference in New Issue