*/}}
Browse Source

nodes improvements

Yiming Wu 2 years ago
parent
commit
0aa76d5fc8
4 changed files with 14 additions and 9 deletions
  1. 2 2
      la_kernel.c
  2. 8 6
      resources/la_nodes_basic.c
  3. 1 0
      resources/la_properties.c
  4. 3 1
      resources/la_widgets.c

+ 2 - 2
la_kernel.c

@@ -97,10 +97,10 @@ static void la_ScanWacomDevices(Display *display, int deviceid){
 }
 
 void laHideCursor(){
-    if(!MAIN.CurrentWindow) return; XFixesHideCursor(MAIN.dpy, MAIN.CurrentWindow->win);
+    //if(!MAIN.CurrentWindow) return; XFixesHideCursor(MAIN.dpy, MAIN.CurrentWindow->win);
 }
 void laShowCursor(){
-    if(!MAIN.CurrentWindow) return; XFixesShowCursor(MAIN.dpy, MAIN.CurrentWindow->win);
+    //if(!MAIN.CurrentWindow) return; XFixesShowCursor(MAIN.dpy, MAIN.CurrentWindow->win);
 }
 
 Window la_CreateWindowX11(int x, int y, int w, int h, char *title, int SyncToVBlank, GLXContext* r_glc){

+ 8 - 6
resources/la_nodes_basic.c

@@ -692,9 +692,10 @@ void laui_RGB2OKHSLNode(laUiList *uil, laPropPack *This, laPropPack *Extra, laCo
         laShowItem(uil,c,This,"color");
     }laEndCondition(uil,b2);
     laShowSeparator(uil,c)->Expand=1;
-    laShowItem(uil,c,This,"out_h")->Flags|=LA_UI_SOCKET_LABEL_W;
-    laShowItem(uil,c,This,"out_s")->Flags|=LA_UI_SOCKET_LABEL_W;
-    laShowItem(uil,c,This,"out_l")->Flags|=LA_UI_SOCKET_LABEL_W;
+    laShowLabel(uil,c,"OKHSL",0,0);
+    laShowItem(uil,c,This,"out_h");
+    laShowItem(uil,c,This,"out_s");
+    laShowItem(uil,c,This,"out_l");
     laEndRow(uil,b);
 }
 
@@ -734,9 +735,10 @@ void laui_OKHSL2RGBNode(laUiList *uil, laPropPack *This, laPropPack *Extra, laCo
     LA_BASE_NODE_HEADER(uil,c,This);
 
     b=laBeginRow(uil,c,0,0);
-    laShowItem(uil,c,This,"in_h")->Flags|=LA_UI_SOCKET_LABEL_E;
-    laShowItem(uil,c,This,"in_s")->Flags|=LA_UI_SOCKET_LABEL_E;
-    laShowItem(uil,c,This,"in_l")->Flags|=LA_UI_SOCKET_LABEL_E;
+    laShowItem(uil,c,This,"in_h");
+    laShowItem(uil,c,This,"in_s");
+    laShowItem(uil,c,This,"in_l");
+    laShowLabel(uil,c,"OKHSL",0,0);
     laShowSeparator(uil,c)->Expand=1; laShowNodeSocket(uil,c,This,"out",0)->Flags|=LA_UI_SOCKET_LABEL_W; 
     laEndRow(uil,b);
 }

+ 1 - 0
resources/la_properties.c

@@ -947,6 +947,7 @@ void la_RegisterInternalProps(){
 
         p = laAddPropertyContainer("la_rack_page", "Rack Page", "A page of nodes", 0, laui_IdentifierOnly, sizeof(laRackPage), 0, 0, 2);{
             laAddStringProperty(p, "name", "Name", "Name of the page", 0, 0, 0, 0, 1, offsetof(laRackPage, Name), 0, 0, 0, 0, LA_AS_IDENTIFIER);
+            laAddIntProperty(p,"type", "Type", "Type of the rack", 0,0,0,0,0,0,0,0,offsetof(laRackPage,RackType),0,0,0,0,0,0,0,0,0,0,LA_READ_ONLY);
             laAddSubGroup(p, "racks", "Racks", "Racks for nodes","la_node_rack",0,0,0,-1,0,0,0,0,0,0,offsetof(laRackPage,Racks),0);
             laAddOperatorProperty(p,"add_rack","Add Rack", "Add a rack into the page", "LA_add_rack", '+', 0);
         }

+ 3 - 1
resources/la_widgets.c

@@ -281,7 +281,9 @@ int la_ColorPickerGetMinWidth(laUiItem *ui){
     return LA_RH * 9;
 }
 int la_SocketGetMinWidth(laUiItem *ui){
-    if(ui->Flags&(LA_UI_SOCKET_LABEL_W|LA_UI_SOCKET_LABEL_E))return LA_RH*3; return LA_RH;
+    if(ui->Flags&(LA_UI_SOCKET_LABEL_W|LA_UI_SOCKET_LABEL_E))return LA_RH*3;
+    if(ui->Flags&(LA_UI_SOCKET_LABEL_S|LA_UI_SOCKET_LABEL_N))return LA_RH*2;
+    return LA_RH;
 }
 
 void la_SingleLineStringDrawSelection(laUiItem *ui, int Begin, int U, laBoxedTheme *bt, uint32_t *str, laStringEdit *se);