|
@@ -1254,6 +1254,9 @@ int laGetReadyWith(laInitArguments* ia){
|
|
#endif
|
|
#endif
|
|
#ifdef LA_LINUX
|
|
#ifdef LA_LINUX
|
|
dpi = la_GetDPI(DefaultRootWindow(MAIN.dpy));
|
|
dpi = la_GetDPI(DefaultRootWindow(MAIN.dpy));
|
|
|
|
+#endif
|
|
|
|
+#ifdef LAGUI_ANDROID
|
|
|
|
+ dpi = 144;
|
|
#endif
|
|
#endif
|
|
if((!dpi) || dpi<144){ dpi=144; } if(dpi>300){ dpi=300; }
|
|
if((!dpi) || dpi<144){ dpi=144; } if(dpi>300){ dpi=300; }
|
|
int UiSize=(int)(tnsLinearItp(16.0f,24.0f,tnsGetRatiod(96,144,dpi))+0.5);
|
|
int UiSize=(int)(tnsLinearItp(16.0f,24.0f,tnsGetRatiod(96,144,dpi))+0.5);
|
|
@@ -8250,6 +8253,7 @@ static void la_AndroidCommandCallback(struct android_app *app, int32_t cmd){
|
|
}
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
+ case APP_CMD_DESTROY:
|
|
case APP_CMD_TERM_WINDOW:
|
|
case APP_CMD_TERM_WINDOW:
|
|
// Detach OpenGL context and destroy discom.yiming.helloplay surface
|
|
// Detach OpenGL context and destroy discom.yiming.helloplay surface
|
|
// NOTE 1: This case is used when the user exits the app without closing it. We detach the context to ensure everything is recoverable upon resuming.
|
|
// NOTE 1: This case is used when the user exits the app without closing it. We detach the context to ensure everything is recoverable upon resuming.
|
|
@@ -8268,7 +8272,6 @@ static void la_AndroidCommandCallback(struct android_app *app, int32_t cmd){
|
|
break;
|
|
break;
|
|
case APP_CMD_SAVE_STATE: break;
|
|
case APP_CMD_SAVE_STATE: break;
|
|
case APP_CMD_STOP: break;
|
|
case APP_CMD_STOP: break;
|
|
- case APP_CMD_DESTROY: break;
|
|
|
|
case APP_CMD_CONFIG_CHANGED:
|
|
case APP_CMD_CONFIG_CHANGED:
|
|
case APP_CMD_WINDOW_RESIZED:
|
|
case APP_CMD_WINDOW_RESIZED:
|
|
MAIN.AppWidth=ANativeWindow_getWidth(MAIN.app->window);
|
|
MAIN.AppWidth=ANativeWindow_getWidth(MAIN.app->window);
|
|
@@ -8571,8 +8574,6 @@ static int32_t la_AndroidInputCallback(struct android_app *app, AInputEvent *eve
|
|
if(flags==AMOTION_EVENT_ACTION_HOVER_MOVE){
|
|
if(flags==AMOTION_EVENT_ACTION_HOVER_MOVE){
|
|
la_SendMouseEvent(0, LA_MOUSEMOVE, rx,ry);
|
|
la_SendMouseEvent(0, LA_MOUSEMOVE, rx,ry);
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
- la_SendMouseEvent(0, LA_MOUSEMOVE, rx,ry);
|
|
|
|
}
|
|
}
|
|
if(!gesture_handled){
|
|
if(!gesture_handled){
|
|
if (flags == AMOTION_EVENT_ACTION_DOWN || flags == AMOTION_EVENT_ACTION_BUTTON_PRESS){
|
|
if (flags == AMOTION_EVENT_ACTION_DOWN || flags == AMOTION_EVENT_ACTION_BUTTON_PRESS){
|