*/}}
YimingWu 4 months ago
parent
commit
b0cd75e4be
3 changed files with 5 additions and 9 deletions
  1. 1 1
      la_kernel.c
  2. 3 7
      resources/la_templates.c
  3. 1 1
      resources/la_widgets.c

+ 1 - 1
la_kernel.c

@@ -606,7 +606,7 @@ int la_CreateSystemWindow(laWindow *window, int SyncToVBlank){
     window->nvg=nvgCreateGL3(NVG_STENCIL_STROKES|NVG_DEBUG|NVG_ANTIALIAS);
 #endif
 
-    window->OutputShowStripes=1; window->Redraw=1;
+    window->OutputShowStripes=0; window->Redraw=1;
     window->GLDebugNeedsUpdate=1;
     window->UseComposing=0; window->ComposingGamma=1.0; window->ComposingBlackpoint=0.0;
 

+ 3 - 7
resources/la_templates.c

@@ -1282,11 +1282,6 @@ void laui_UserPreference(laUiList *uil, laPropPack *Base, laPropPack *OperatorIn
     laColumn *mc, *mcl, *mcr, *mcll, *mclr;
     laUiItem *b, *bracket;
 
-    //_LA_PANEL_USER_PREFERENCE = p;
-    //la_UDFAppendSharedTypePointer("_LA_PANEL_USER_PREFERENCE", _LA_PANEL_USER_PREFERENCE);
-    //p->Show = 0;
-    //p->FastUpdate = 1;
-
     b=laBeginRow(uil,cl,0,0); 
     muil = laMakeMenuPage(uil, cr, "☰ Menu"); mc = laFirstColumn(muil);
     laShowItem(muil, mc, 0, "LA_restore_factory");
@@ -1408,8 +1403,8 @@ void laui_UserPreference(laUiList *uil, laPropPack *Base, laPropPack *OperatorIn
             laShowLabel(muil, mcl, "Pads/Joysticks:", 0, 0)->Flags|=LA_TEXT_ALIGN_RIGHT;
             laShowItemFull(muil, mcr, 0, "LA_panel_activator",0,"panel_id=LAUI_controllers;text=Configure",0,0);
 
+#ifndef LAGUI_ANDROID
             laShowSeparator(muil,mc);
-
             laShowLabel(muil, mc, "Wacom Devices:", 0, 0);
 #ifdef _WIN32
             b=laBeginRow(muil,mcl,0,0); laShowSeparator(muil,mcl)->Expand=1;
@@ -1421,7 +1416,8 @@ void laui_UserPreference(laUiList *uil, laPropPack *Base, laPropPack *OperatorIn
             laShowItem(muil, mcl, &UP->PP, "wacom_device_stylus");
             laShowItem(muil, mcl, &UP->PP, "wacom_device_eraser");
             laShowItemFull(muil, mcr, 0, "LA_refresh_controllers",0,"text=Refresh",0,0);
-#endif
+#endif //!win32
+#endif //!android
         }
         if(MAIN.InitArgs.HasAudio){
             muil = laAddTabPage(bracket, "Audio");{

+ 1 - 1
resources/la_widgets.c

@@ -3037,7 +3037,7 @@ int OPMOD_SingleLineString(laOperator *a, laEvent *e){
                 return LA_RUNNING;
             }
         }else if (e->key == LA_KEY_ESCAPE && ui->State != LA_UI_NORMAL){
-            ui->State = LA_UI_NORMAL; la_DisplayKeyboard(0);
+            ui->State = LA_UI_NORMAL; la_DisplayKeyboard(0); strEndEdit(&uit->Edit,1);
             laRedrawCurrentPanel();
             return LA_FINISHED;
         }