*/}}
YimingWu 2 днів тому
батько
коміт
9d9dd1183d

+ 4 - 3
la_kernel.c

@@ -5818,8 +5818,9 @@ void la_InitRowNode(laRowInfo* ri, laUiItem* ui, laBoxedTheme* bt){
     ri->MaxB=ui->TU;
 }
 void la_AddRowNode(laRowInfo* ri, laUiItem* ui, laBoxedTheme* bt, int H, int WaitAnimation){
-    laRowNode* rn=CreateNew(laRowNode);
-    rn->LP=LA_M;rn->RP=LA_M;
+    laRowNode* rn=CreateNew(laRowNode); int margin=LA_M;
+    if(ui->Flags&LA_UI_FLAGS_NO_GAP){ margin=0; }
+    rn->LP=margin;rn->RP=margin;
     rn->GotW = (ui->Type->GetMinWidth?ui->Type->GetMinWidth(ui):(LA_RH));
     rn->ui=ui;
     rn->H=H;
@@ -5836,7 +5837,7 @@ void la_AddRowNode(laRowInfo* ri, laUiItem* ui, laBoxedTheme* bt, int H, int Wai
     ri->ExpandAccum+=ui->Expand;
     ri->CountElements++;
     if(ui->Expand){ri->Expand=1;}
-    if(ri->U+H+LA_M>ri->MaxB){ri->MaxB=ri->U+H+LA_M;}
+    if(ri->U+H+margin>ri->MaxB){ri->MaxB=ri->U+H+margin;}
 }
 int la_ShrinkableRowElements(laRowInfo* ri){
     int count=0;

+ 1 - 1
resources/la_operators.c

@@ -2367,7 +2367,7 @@ int OPMOD_MenuPanel(laOperator *a, laEvent *e){
     laListHandle Locals = {0};
     laGeneralUiExtraData *uid = a->CustomData;
 
-    if( MAIN.DockingPanel==p ){return LA_FINISHED; }//unlikely
+    if( MAIN.DockingPanel==p ){ return LA_FINISHED; }//unlikely
 
     int IsClose=laIsCloseToPanel(p,x,y);
     int IsIn=laIsInPanel(p, x, y);

+ 3 - 3
resources/la_templates.c

@@ -1217,7 +1217,7 @@ void laui_ManagedPropInstance(laUiList *uil, laPropPack *Base, laPropPack *Opera
         if(p->PropertyType!=LA_PROP_SUB || p->UDFIsRefer) continue;
         la_EnsureSubTarget(p,0); 
         if(p->SubProp &&p->SubProp->Hyper!=2 &&(!p->UDFIsSingle)) continue;
-        if(p->UDFNoCreate || p->UDFHideInSave) continue;
+        if(p->UDFNoCreate || p->UDFHideInSave || p->UDFIsSingle) continue;
         if(p==pc->SaverDummy){
             laShowItem(uil,cl,Base,"__single_saver_dummy.__modified");
             laShowItem(uil,crl,Base,"identifier")->Flags|=LA_UI_FLAGS_PLAIN;
@@ -2012,7 +2012,7 @@ void laget_ToolboxPanelExtraInfo(laPanel* panel, char* content, char** here){
     }
 }
 void laset_ToolboxPanelExtraInfo(laPanel* panel, char* content){
-    laStringSplitor* ss; strMakeInstructions(&ss,content); if(!ss) return;
+    laStringSplitor* ss=0; strMakeInstructions(&ss,content); if(!ss) return;
     laInputMapping* im=0; int layout=0; laEnumProp *ep; laSubProp *sp; char* value;
     if(value=strGetArgumentString(ss,"toolbox")){ im=laFindToolbox(value); }
     if(value=strGetArgumentString(ss,"layout")){ sscanf(value,"%d",&layout); }
@@ -2048,7 +2048,7 @@ void laui_Toolbox(laUiList *uil, laPropPack *This, laPropPack *Extra, laColumn *
             laShowSeparator(muil,mc)->Expand=1;
             laShowItem(muil, mc, This, "hide")->Flags|=LA_UI_FLAGS_ICON;
             laShowItem(muil, mc, This, "dock")->Flags|=LA_UI_FLAGS_ICON;
-            laShowItemFull(muil, mc, This, "close",0,"text=Close Toolbox",0,0);
+            laShowItemFull(muil, mc, This, "close",0,"text=Close Toolbox",0,0)->Flags|=LA_UI_FLAGS_NO_CONFIRM;
         }laEndRow(muil,b0);
         laShowLabel(muil,mc,"Select a toolbox:",0,0)->Flags|=LA_TEXT_MONO;
         laShowItemFull(muil,mc,Extra,"toolbox",LA_WIDGET_COLLECTION,0,laui_IdentifierOnly,0);

+ 2 - 2
resources/la_tns_shader_infrastructure.cpp

@@ -47,7 +47,7 @@ std::string tnsEnsureShaderCommomsLib(std::string in, std::string lib, std::stri
     return str;
 }
 int tnsCheckShaderCompileStatus(GLuint shader_object, char* name){
-    int status=0; char error[65536]={0};
+    int status=0; char error[512]={0};
     glGetShaderiv(shader_object, GL_COMPILE_STATUS, &status);
     if (status == GL_FALSE){
         glGetShaderInfoLog(shader_object, sizeof(error), 0, error); logPrintNew("%s shader error:\n%s\n",name?name:"(unnamed)",error);
@@ -58,7 +58,7 @@ int tnsCheckShaderCompileStatus(GLuint shader_object, char* name){
     return 1;
 }
 int tnsCheckProgramLinkStatus(GLuint program_object, char* name){
-    int status=0; char error[65536]={0};
+    int status=0; char error[512]={0};
     glGetProgramiv(program_object, GL_LINK_STATUS, &status);
     if (status == GL_FALSE){
         glGetProgramInfoLog(program_object, sizeof(error), 0, error); logPrintNew("%s program Linking error:\n%s\n",name?name:"(unnamed)",error);

+ 1 - 1
resources/la_widgets.c

@@ -1434,7 +1434,7 @@ void la_ConditionToggleDraw(laUiItem *ui, int h){
     laBoxedTheme *bt = (*ui->Type->Theme);
     char *buf[LA_RAW_CSTR_MAX_LEN];
     char *buf2[LA_RAW_CSTR_MAX_LEN]; buf2[0]=0;
-    uint32_t IconID;
+    uint32_t IconID=0;
     int NoDecal=ui->Flags&LA_UI_FLAGS_NO_DECAL;
     int sf=bt->TextShadow?LA_TEXT_SHADOW:0;