@@ -12,6 +12,7 @@

  *      20250223 Draw pane titles and main dir list.

  *      20250224 Draw right dir list and store elem positions.

  *      20250225 Draw image placeholders

+ *      20250226 Fix rightside positions

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -37,7 +38,7 @@

 #define LEFTSIZE 720

 #define DEFAULTDIRDATAHEIGHT 150

 #define DEFAULTDIRDATATRIANGLEW 35

-#define LEFTIMAGESIDELEN 150

+#define LEFTIMAGESIDELEN 130

 #define FONTSIZE 18

 #define FONTBIGSIZE 32

@@ -686,6 +687,8 @@ im_body_draw(body_t *body, int windowwidth, int windowheight)

                         int sidelen;

                         if(is_leftside && !(i==body->currentdirdata))

                                 continue; /* this element is not in leftside */

+                        margin=font->height/4;

+                        sidelen=(is_leftside)?LEFTIMAGESIDELEN:dirdata->height-(fontbig->height+fontbig->height/4+font->height+margin*4+fontbig->height/4);

                         if(is_leftside) {

                                 /* draw left side back arrow */

                                 v2.x=(float) (body->xywh.x+fontbig->height/2);

@@ -721,7 +724,7 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                   ,(Vector2) {body->xywh.x+body->leftsize+fontbig->height/2,righty+fontbig->height/4}

                                   ,fontbig->height

                                   ,0

-                                  ,(Color){ 65, 65, 65, 255 }

+                                  ,(Color){ 240, 240, 240, 255 }

                                 );

                         }

                         /* directories */

@@ -733,11 +736,11 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                         } else {

                                 x0=body->xywh.x+body->leftsize+fontbig->height/2;

                                 x1=body->xywh.x+body->xywh.w-font->height/2;

-                                y0=righty+fontbig->height/4+fontbig->height+font->height/4;

+                                y0=righty+fontbig->height/4+fontbig->height+margin;

                                 y1=y0+margin*2+font->height-1;

                         }

-                        margin=font->height/4;

                         for(k=0,x=x0,y=y0;k<dirdata->listing.usedelems;k++) {

+                                Color c=(is_leftside)?((Color){ 65, 65, 65, 255 }):((Color){ 240, 240, 240, 255 });

                                 elem=dirdata->listing.elems+k;

                                 if(elem->name[0]!='d' || strcmp(elem->name,"d.")==0 || strcmp(elem->name,"d..")==0)

                                         continue;

@@ -751,7 +754,7 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                                   ,(Vector2) {x+margin,y+(fontbig->height-fonthuge->height)}

                                                   ,fonthuge->height

                                                   ,0

-                                                  ,(Color){ 65, 65, 65, 255 }

+                                                  ,c

                                                 );

                                          }

                                         x=x0,y+=font->height+margin*2+font->height/4;

@@ -760,12 +763,12 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                 }

                                 if(is_leftside) {

                                         FILLXYWH(elem->leftxywh,x,y,margin*2+m2.x,margin*2+font->height);

-                                        DrawRectangleLines(UNROLLXYWH(elem->leftxywh),((Color){0,0,0,255}));

+                                        DrawRectangleLines(UNROLLXYWH(elem->leftxywh),c);

                                 } else {

                                         FILLXYWH(elem->xywh,x,y,margin*2+m2.x,margin*2+font->height);

-                                        DrawRectangleLines(UNROLLXYWH(elem->xywh),((Color){0,0,0,255}));

+                                        DrawRectangleLines(UNROLLXYWH(elem->xywh),c);

                                 }

-                                DrawTextEx(font->font,elem->name+1,(Vector2){x+margin,y+margin},font->height,0,(Color){ 65, 65, 65, 255 });

+                                DrawTextEx(font->font,elem->name+1,(Vector2){x+margin,y+margin},font->height,0,c);

                                 x+=margin*2+m2.x+font->height/4;

                         }

                         /* files */

@@ -773,9 +776,9 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                 y0=(x==x0)?y:y+font->height+margin*2+font->height/4;

                                 sidelen=LEFTIMAGESIDELEN;

                         } else {

-                                y0=righty; //y0+margin*2+font->height+font->height/2;

-                                y1=righty+dirdata->height-fontbig->height/4;

-                                sidelen=y1-y0-1;

+                                y0=righty+dirdata->height-sidelen-margin-fontbig->height/4;

+                                y1=y0+sidelen+margin;

+                                x0-=margin;

                         }

                         for(k=0,x=x0,y=y0;k<dirdata->listing.usedelems;k++) {

                                 elem=dirdata->listing.elems+k;

@@ -790,7 +793,7 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                                   ,(Vector2) {x+margin,y+(sidelen-fonthuge->height)}

                                                   ,fonthuge->height

                                                   ,0

-                                                  ,(Color){ 65, 65, 65, 255 }

+                                                  ,(Color){ 0,0,0,64 }

                                                 );

                                          }

                                         x=x0,y+=sidelen+margin*2;

@@ -809,10 +812,11 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                         char shortname[1024];

                                         xywh_t *pos;

                                         int l;

+                                        font_t *myfont=(is_leftside)?fonthuge:font;

                                         pos=is_leftside?&(elem->leftxywh):&(elem->xywh);

                                         if((ptr=strchr(elem->name+1,'.'))!=NULL) {

-                                                m2=MeasureTextEx(fonthuge->font,ptr,fonthuge->height,0);

-                                                DrawTextEx(fonthuge->font,ptr,(Vector2){x+margin+(sidelen-m2.x)/2,y+margin+(sidelen-fonthuge->height)/2},fonthuge->height,0,(Color){ 65, 65, 65, 255 });

+                                                m2=MeasureTextEx(myfont->font,ptr,myfont->height,0);

+                                                DrawTextEx(myfont->font,ptr,(Vector2){x+margin+(sidelen-m2.x)/2,y+(font->height)/2+margin+(sidelen-myfont->height)/2},myfont->height,0,(Color){ 0,0,0,96 });

                                         }

                                         ptr=(ptr==NULL)?elem->name+1:ptr;

                                         l=(ptr-(elem->name+1));

@@ -820,7 +824,7 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                         memcpy(shortname,elem->name+1,l);

                                         shortname[l]='\0';

                                         DrawRectangle(pos->x,pos->y,pos->w,font->height+font->height/2,((Color){0,0,0,64}));

-                                        DrawTextEx(font->font,shortname,(Vector2){pos->x+font->height/4,pos->y+font->height/4},font->height,0,(Color){ 255, 255, 255, 255 });

+                                        DrawTextEx(font->font,shortname,(Vector2){pos->x+font->height/4,pos->y+font->height/4},font->height,0,(Color){ 192,192,192,255 });

                                 }

                                 x+=margin*2+sidelen;

                         }

@@ -834,67 +838,6 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                         }

                 }

         }

-#if 0

-        /* example from menubar */

-        int i,j,k,x;

-        menudata_t *menudata;

-        font_t *font;

-        if(menubar==NULL || font==NULL)

-                return(-1); /* sanity check failed */

-        font=menubar->ptrfont;

-        DrawRectangle(0,0,windowwidth, font->height+font->height/2, (Color){ 235, 235, 235, 235 } );

-        for(i=0,x=0;i<menubar->sizemenudata;i++) {

-                Vector2 v2;

-                menudata=menubar->menudata[i];

-                v2=MeasureTextEx(font->font,menudata->title,font->height,0);

-                FILLXYWH(menudata->xywh,x,0,((int)v2.x)+font->height,font->height+font->height/2);

-                v2.x=(float) (menudata->xywh.x+font->height/2);

-                v2.y=(float) (menudata->xywh.y+font->height/4);

-                DrawTextEx(font->font

-                  ,menudata->title

-                  ,v2

-                  ,font->height

-                  ,0

-                  ,(Color){ 45, 45, 45, 255 }

-                );

-                if(menudata->flag_open || menudata->flag_stickyopen) {

-                        int underline_height=3;

-                        int maxw;

-                        DrawRectangle(menudata->xywh.x,menudata->xywh.y+menudata->xywh.h-underline_height,menudata->xywh.w,underline_height, (Color){ 53,132,228,255 } );

-                        for(j=0,maxw=0;j<menudata->sizeoptions;j++) {

-                                v2=MeasureTextEx(font->font,menudata->options[j],font->height,0);

-                                maxw=(((int)(v2.x))>maxw)?((int)(v2.x)):maxw;

-                        }

-                        maxw=(maxw<(menudata->xywh.w+font->height))?(menudata->xywh.w+font->height):maxw;

-                        maxw+=font->height;

-                        FILLXYWH(menudata->optionsxywh,menudata->xywh.x+1,menudata->xywh.y+menudata->xywh.h+2,maxw,(font->height+font->height/2)*menudata->sizeoptions);

-                        DrawLine(menudata->optionsxywh.x-1,menudata->optionsxywh.y-2,menudata->optionsxywh.x+menudata->optionsxywh.w+2,menudata->optionsxywh.y-2,(Color){ 255,255,255,255 } );

-                        DrawLine(menudata->optionsxywh.x-1,menudata->optionsxywh.y,menudata->optionsxywh.x-1,menudata->optionsxywh.y+menudata->optionsxywh.h+1,(Color){ 255,255,255,255 } );

-                        DrawLine(menudata->optionsxywh.x+menudata->optionsxywh.w+2,menudata->optionsxywh.y,menudata->optionsxywh.x+menudata->optionsxywh.w+2,menudata->optionsxywh.y+menudata->optionsxywh.h+1,(Color){ 192,192,192,255 } );

-                        DrawLine(menudata->optionsxywh.x-1,menudata->optionsxywh.y+menudata->optionsxywh.h+1,menudata->optionsxywh.x+menudata->optionsxywh.w+2,menudata->optionsxywh.y+menudata->optionsxywh.h+1,(Color){ 192,192,192,255 } );

-                        DrawRectangle(menudata->optionsxywh.x,menudata->optionsxywh.y,menudata->optionsxywh.w,menudata->optionsxywh.h,(Color){ 235, 235, 235, 235 });

-                        for(k=0;k<menudata->sizeoptions;k++) {

-                                Color c;

-                                c=(k==menudata->currentoption)?((Color){ 255,255,255,255 }):((Color){ 45, 45, 45, 255 });

-                                if(k==menudata->currentoption)

-                                        DrawRectangle(menudata->optionsxywh.x+1,menudata->optionsxywh.y+(font->height+(font->height/2))*k,menudata->optionsxywh.w-2,font->height+font->height/2,(Color){ 53,132,228,255 });

-                                v2.x=(float) (menudata->optionsxywh.x+font->height/2);

-                                v2.y=(float) (menudata->optionsxywh.y+(font->height/4)+(font->height+(font->height/2))*k);

-                                DrawTextEx(font->font

-                                  ,menudata->options[k]

-                                  ,v2

-                                  ,font->height

-                                  ,0

-                                  ,c

-                                );

-                        }

-                } else {

-                        FILLXYWH(menudata->optionsxywh,0,0,0,0);

-                }

-                x=menudata->xywh.x+menudata->xywh.w;

-        }

-        return(0);

-#endif

         return(0);

 }