*/}}
Browse Source

UI cleanups

YimingWu 4 months ago
parent
commit
00e26ca576
4 changed files with 11 additions and 4 deletions
  1. 9 2
      ouroperations.c
  2. 2 0
      ourpaint.c
  3. 0 1
      ourtranslations_es-ES.c
  4. 0 1
      ourtranslations_zh-hans.c

+ 9 - 2
ouroperations.c

@@ -418,7 +418,9 @@ void ourui_BrushesPanel(laUiList *uil, laPropPack *This, laPropPack *DetachedPro
             laShowSeparator(uil,c);
 
             OUR_BR laShowItemFull(uil,c,0,"our.brush_page",0,0,0,0)->Flags|=LA_UI_FLAGS_EXPAND|LA_UI_FLAGS_ICON|LA_UI_FLAGS_NO_CONFIRM;
-            laShowSeparator(uil,c)->Expand=1; OUR_ER
+            laShowSeparator(uil,c)->Expand=1;
+            laShowItem(uil,c,0,"OUR_new_brush")->Flags|=LA_UI_FLAGS_NO_CONFIRM;
+            OUR_ER
         }laEndCondition(uil,b);
         b=laOnConditionThat(uil,c,laEqual(laPropExpression(0,"our.brush_page"),laIntExpression(OUR_BRUSH_PAGE_LIST)));{
             laShowItemFull(uil,c,0,"our.tools.brushes",0,0,0,0)->Flags|=LA_UI_FLAGS_NO_CONFIRM;
@@ -3738,13 +3740,18 @@ int ourInit(){
     Our->uAlphaTop=glGetUniformLocation(Our->CompositionProgram,"uAlphaTop");
     Our->uAlphaBottom=glGetUniformLocation(Our->CompositionProgram,"uAlphaBottom");
 
-    Our->DefaultScale=0.5;
 
     Our->X=-2800/2; Our->W=2800;
     Our->Y=2400/2;  Our->H=2400;
     Our->BorderAlpha=0.6;
 
+#ifdef LA_USE_GLES
+    Our->DefaultScale=0.5;
+    Our->SpectralMode=0;
+#else
+    Our->DefaultScale=1.0;
     Our->SpectralMode=1;
+#endif
 
     Our->BackgroundType=2;
     Our->BackgroundFactor=1;

+ 2 - 0
ourpaint.c

@@ -65,9 +65,11 @@ int main(int argc, char *argv[]){
         laLayout* l = laDesignLayout(w, "Our Paint");
         laBlock* b = l->FirstBlock;
 #ifdef LAGUI_ANDROID
+        b->Folded = 1;
         laCreatePanel(b, "panel_canvas");
 #else
         laSplitBlockHorizon(b,0.7);
+        b->B1->Folded = 1;
         laCreatePanel(b->B1, "panel_canvas");
         laBlock* br=b->B2;
         laSplitBlockVertical(br,0.6);

+ 0 - 1
ourtranslations_es-ES.c

@@ -28,7 +28,6 @@ extern tnsMain* T;
 extern OurPaint *Our;
 
 static const char *entries[]={
-"Menu","Menú",
 "Show brush direction:","Mostrar la dirección del pincel:",
 "Not registered","No registrado",
 "Registered","Registrado",

+ 0 - 1
ourtranslations_zh-hans.c

@@ -23,7 +23,6 @@ extern tnsMain* T;
 extern OurPaint *Our;
 
 static const char *entries[]={
-"Menu","菜单",
 "Show brush direction:","显示笔刷方向:",
 "Linear D65 P3","线性 D65 P3",
 "Auto","自动",