*/}}
Browse Source

Default pigment mixing

YimingWu 6 days ago
parent
commit
72219cde15
2 changed files with 11 additions and 0 deletions
  1. 9 0
      ouroperations.c
  2. 2 0
      ourtranslations_zh-hans.c

+ 9 - 0
ouroperations.c

@@ -4586,6 +4586,10 @@ void ourui_MenuButtons(laUiList *uil, laPropPack *pp, laPropPack *actinst, laCol
         laShowItem(muil,mc,0,"OUR_clear_empty_tiles");
         laShowItem(muil,mc,0,"OUR_clear_empty_tiles");
         laShowItemFull(muil,mc,0,"our.preferences.show_debug_tiles",LA_WIDGET_ENUM_HIGHLIGHT,"text=👁",0,0);
         laShowItemFull(muil,mc,0,"our.preferences.show_debug_tiles",LA_WIDGET_ENUM_HIGHLIGHT,"text=👁",0,0);
         laEndRow(muil,row);
         laEndRow(muil,row);
+        laShowSeparator(muil,mc);
+        laShowLabel(muil,mc,"Pigments",0,0)->Flags|=LA_UI_FLAGS_DISABLED;
+        laShowItemFull(muil, mc, 0, "LA_panel_activator", 0, "text=List of Pigments;panel_id=panel_pigments;", 0, 0);
+        laShowSeparator(muil,mc);
         laShowLabel(muil, mc, "Settings", 0, 0)->Flags|=LA_TEXT_MONO|LA_UI_FLAGS_DISABLED;
         laShowLabel(muil, mc, "Settings", 0, 0)->Flags|=LA_TEXT_MONO|LA_UI_FLAGS_DISABLED;
         laShowItemFull(muil, mc, 0, "LA_panel_activator", 0, "text=User Preferences;panel_id=LAUI_user_preferences;", 0, 0);
         laShowItemFull(muil, mc, 0, "LA_panel_activator", 0, "text=User Preferences;panel_id=LAUI_user_preferences;", 0, 0);
     }
     }
@@ -5664,6 +5668,11 @@ void ourFinalize(){
     memAssignRef(Our,&Our->UseWhite,default_white);
     memAssignRef(Our,&Our->UseWhite,default_white);
     memAssignRef(Our,&Our->UseBlack,default_black);
     memAssignRef(Our,&Our->UseBlack,default_black);
 
 
+    if(default_black){
+        our_PigmentMix(&Our->MixedPigment,&default_black->Pigment,0.4);
+        our_PigmentToPreviewSelf(&Our->MixedPigment);
+    }
+
     if(!Our->CurrentPalette){ memAssignRef(Our,&Our->CurrentPalette,Our->Palettes.pFirst); }
     if(!Our->CurrentPalette){ memAssignRef(Our,&Our->CurrentPalette,Our->Palettes.pFirst); }
 
 
     laMarkMemClean(Our->CanvasSaverDummyList.pFirst);
     laMarkMemClean(Our->CanvasSaverDummyList.pFirst);

+ 2 - 0
ourtranslations_zh-hans.c

@@ -23,6 +23,8 @@ extern tnsMain* T;
 extern OurPaint *Our;
 extern OurPaint *Our;
 
 
 static const char *entries[]={
 static const char *entries[]={
+"List of Pigments", "颜料列表",
+"New Palette", "新增调色板",
 "Depleted", "耗尽",
 "Depleted", "耗尽",
 "When tool undo is enabled, brush nodes can't be moved across node racks",
 "When tool undo is enabled, brush nodes can't be moved across node racks",
     "工具撤销启用时,笔刷节点不能在挂架上左右移动",
     "工具撤销启用时,笔刷节点不能在挂架上左右移动",