*/}}
Browse Source

various cleanups

YimingWu 2 months ago
parent
commit
430a81395d
4 changed files with 10 additions and 10 deletions
  1. 0 2
      la_data.c
  2. 3 3
      la_kernel.c
  3. 0 1
      la_tns_kernel.c
  4. 7 4
      resources/la_operators.c

+ 0 - 2
la_data.c

@@ -3976,8 +3976,6 @@ void laRefreshUDFResourcesIn(char* rootpath){
     struct dirent **NameList=0;
     NumFiles=scandir(rootpath,&NameList,0,alphasort);
 
-    logPrintNew("%d %s",NumFiles,rootpath);
-
     for(int i=0;i<NumFiles;i++){
         struct dirent* d = NameList[i]; int dlen;
         char *format = strGetLastSegment(d->d_name, '.'); int file_okay=0;

+ 3 - 3
la_kernel.c

@@ -1038,6 +1038,7 @@ void laSetDefaultInitArguments(laInitArguments* ia){
 }
 void laSetCompleteInitArguments(laInitArguments* ia){
     ia->GLMajor=3; ia->GLMinor=3; ia->BufferSamples=0;
+    ia->GLESMajor=3; ia->GLESMinor=0;
     ia->UseColorManagement=1;
     ia->HasWorldObjects=1;
     ia->HasAction=1;
@@ -7609,7 +7610,7 @@ int laInvokePCreateThis(laOperator *From, laOperatorType *at, laEvent *e, laProp
 }
 int laInvokeUiP(laOperator *From, laOperatorType *at, laEvent *e, void *inst, laListHandle *Locals, int IgnoreLocals){
     laOperator *a, *f = From;
-    int rev;
+    int rev=0;
 
     if (!at || (la_UiOperatorExists(inst))){ return -1; }
     a = la_CreateOperator(at);
@@ -8894,6 +8895,7 @@ static int32_t la_AndroidInputCallback(struct android_app *app, AInputEvent *eve
         }
         if(!gesture_handled){
             if (flags == AMOTION_EVENT_ACTION_DOWN || flags == AMOTION_EVENT_ACTION_BUTTON_PRESS){
+                la_SendMouseEvent(0,LA_MOUSEMOVE,x,y);
                 la_SendMouseEvent(0,LA_MOUSEMOVE,x,y);
                 int btn=AMotionEvent_getButtonState(event);
                 int evtype=LA_L_MOUSE_DOWN;
@@ -9082,7 +9084,6 @@ void la_DisplayKeyboard(bool pShow) {
     // Retrieves NativeActivity.
     jobject lNativeActivity = MAIN.app->activity->clazz;
     jclass ClassNativeActivity = (*lJNIEnv)->GetObjectClass(lJNIEnv,lNativeActivity);
-    logPrintNew("jvm3");
 
     // Retrieves Context.INPUT_METHOD_SERVICE.
     jclass ClassContext = (*lJNIEnv)->FindClass(lJNIEnv,"android/content/Context");
@@ -9093,7 +9094,6 @@ void la_DisplayKeyboard(bool pShow) {
         (*lJNIEnv)->GetStaticObjectField(lJNIEnv,ClassContext,
             FieldINPUT_METHOD_SERVICE);
     //jniCheck(INPUT_METHOD_SERVICE);
-    logPrintNew("jvm4");
 
     // Runs getSystemService(Context.INPUT_METHOD_SERVICE).
     jclass ClassInputMethodManager = (*lJNIEnv)->FindClass(lJNIEnv,

+ 0 - 1
la_tns_kernel.c

@@ -197,7 +197,6 @@ void tnsContextMakeWindowCurrent(laWindow* w){
 #ifdef LAGUI_ANDROID
     T->CurrentContext=MAIN.glc; T->CurrentSurface=MAIN.egl_surf;
     if (eglMakeCurrent(MAIN.egl_dpy, MAIN.egl_surf, MAIN.egl_surf, MAIN.glc) == EGL_FALSE) { logPrint("Android can't make current"); return; }
-    return;
 #else
     tnsContextMakeCurrent(w->glc,w->win,w->egl_surf);
 #endif

+ 7 - 4
resources/la_operators.c

@@ -2223,13 +2223,13 @@ int OPMOD_Panel(laOperator *a, laEvent *e){
     if(p->PanelTemplate && laKeyMapExecuteEvent(a, &p->PanelTemplate->KeyMap, e)) return RET;
 
     int IsTop=laIsTopPanel(p);
-    if (!IsTop && !uid->TargetIndexVali){
+    if ((!IsTop) && (!uid->TargetIndexVali)){
         laLocalToWindow(0, p, &x, &y);
         dp = laDetectPanel(x, y);
         if (dp && dp->Mode && dp != p){
             return LA_FINISHED;
         }else if ((e->type & LA_MOUSEDOWN) == LA_MOUSEDOWN){
-            laPopPanel(p); IsTop=1;
+            laPopPanel(p); laRedrawCurrentWindow(); IsTop=1;
         }else if(p->Mode) return LA_RUNNING;
         laWindowToLocal(0, p, &x, &y);
     }
@@ -2249,7 +2249,7 @@ int OPMOD_Panel(laOperator *a, laEvent *e){
 
     if(la_ScrollPanel(uid,p,e))return LA_RUNNING;
 
-    if (!p->Mode || (IsTop && !uid->TargetIndexVali)){
+    if ((!p->Mode) || (!uid->TargetIndexVali)){
         if(y<p->UI.U){ ui = la_DetectUiItemRecursive(&p->TitleBar, x, y, 10000, &Locals, 0); }
         elif (!ui && (!NoPrimaryUI)){
             lstClearPointer(&Locals);
@@ -2259,7 +2259,9 @@ int OPMOD_Panel(laOperator *a, laEvent *e){
     if (ui && !a->Child && ui->Type->OperatorType && !la_UiOperatorExists(ui)){
         laSetOperatorLocalizer(p);
         //laPanelToLocal(a, &t, &UIB);
-        if (!(laInvokeUiP(a, ui->Type->OperatorType, e, ui, &Locals, 0) & LA_FINISH)){ laRetriggerOperators(); }
+        if (!(laInvokeUiP(a, ui->Type->OperatorType, e, ui, &Locals, 0) & LA_FINISH)){
+            laRetriggerOperators(); laPopPanel(p); IsTop=1; laRedrawCurrentWindow(); return LA_RUNNING;
+        }
         lstClearPointer(&Locals);
         //return LA_RUNNING;
     }
@@ -2280,6 +2282,7 @@ int OPMOD_Panel(laOperator *a, laEvent *e){
         if (uid->TargetIndexVali == 1){
             if (!p->SL && !p->SR) p->TX = p->X + e->x - uid->LastX;
             if (!p->ST && !p->SB) p->TY = p->Y + e->y - uid->LastY;
+            laPopPanel(p); laRedrawCurrentWindow(); IsTop=1;
             laNotifyUsersPPPath(&p->PP, "position");
             la_EnsurePanelSnapping(p, MAIN.CurrentWindow->CW, MAIN.CurrentWindow->CH);
             laRecalcCurrentPanel();