@@ -17,6 +17,7 @@

  *      20250301 Aesthetic fixes for leftside.

  *               Basic image loading.

  *               Show big image on hover.

+ *               Preserve aspect ratio of big image.

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -118,13 +119,15 @@ typedef struct menubar_t {

         font_t *ptrfont;

 } menubar_t;

-typedef struct listingdata_t {

-        xywh_t leftxywh;

-        Texture2D lefttexture;

-        int has_lefttexture;

+typedef struct thumb_t {

         xywh_t xywh;

         Texture2D texture;

         int has_texture;

+} thumb_t;

+

+typedef struct listingdata_t {

+        thumb_t left;

+        thumb_t right;

         char *name; /* first byte in the name is the type, next is the name, i.e. a directory is "dhome" and a file is "f.bashrc" (this is done for easier sorting) */

 } listingdata_t;

@@ -158,6 +161,8 @@ typedef struct body_t {

         font_t *ptrfonthuge;

         char currenttexture[1024];

         Texture2D texture;

+        int texturew;

+        int textureh;

         int has_texture;

 } body_t;

@@ -191,7 +196,7 @@ void im_body_free(body_t *body);

 int im_body_add(body_t *body,char *dir);

 int im_body_mouse(body_t *body, Vector2 mousepos, int lmbpressed, int lmbreleased, int lmbdown, int *click_avail);

-int im_body_draw(body_t *body, Vector2 mousepos, int windowwidth, int windowheight);

+int im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int windowwidth, int windowheight);

 int listing_get(listing_t *listing, char *pathprefix, char *path, int flag_sort);

 void listing_freedata(listing_t *listing);

@@ -202,6 +207,7 @@ int imutil_submenu_count(char *menus);

 char *imutil_submenu_get(char *menus, int targetn, int *len);

 char *imutil_strduplen(char *str, int len);

 int is_imutil_insidexywh(Vector2 pos, xywh_t *xywh);

+int im_util_aspectmaximize(int w, int h, int maxw, int maxh, int *neww, int *newh);

 int menudata_pos2option(menudata_t *menudata, Vector2 pos);

 int *getcodepoints(int *sizecodepoints);

 int is_imagefilename(char *filename);

@@ -242,7 +248,7 @@ fprintf(stderr,"SELECTED: \"%s\"->\"%s\"\n",sel_menu,sel_submenu);

                 /* draw screen contents */

                 BeginDrawing();

                 ClearBackground(RAYWHITE);

-                im_body_draw(im->body,mousepos,im->w,im->h);

+                im_body_draw(im->body,mousepos,lmbdown,im->w,im->h);

                 im_menubar_draw(im->menubar,im->w,im->h);

 #if 0

 {

@@ -717,7 +723,7 @@ im_body_mouse(body_t *body, Vector2 mousepos, int lmbpressed, int lmbreleased, i

                 ld=dirdata->listing.elems+i;

                 if(ld->name[0]!='d')

                         continue;

-                if(is_imutil_insidexywh(mousepos,&(ld->leftxywh))) {

+                if(is_imutil_insidexywh(mousepos,&(ld->left.xywh))) {

                         char *newname,*oldprefix;

                         int l,l0,l1;

                         static char sep[]={SEP};

@@ -745,7 +751,7 @@ im_body_mouse(body_t *body, Vector2 mousepos, int lmbpressed, int lmbreleased, i

 }

 int

-im_body_draw(body_t *body, Vector2 mousepos, int windowwidth, int windowheight)

+im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int windowwidth, int windowheight)

 {

         int i,x,y,k,margin,righty;

         dirdata_t *dirdata;

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

                                                 continue;

                                 }

                                 if(is_leftside) {

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

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

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

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

                                 } else {

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

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

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

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

                                 }

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

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

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

                                                 continue;

                                 }

                                 if(is_leftside) {

-                                        FILLXYWH(elem->leftxywh,x+margin,y+margin,sidelen,sidelen);

-                                        DrawRectangle(UNROLLXYWH(elem->leftxywh),((Color){0,0,0,64}));

+                                        FILLXYWH(elem->left.xywh,x+margin,y+margin,sidelen,sidelen);

+                                        DrawRectangle(UNROLLXYWH(elem->left.xywh),((Color){0,0,0,64}));

                                 } else {

-                                        FILLXYWH(elem->xywh,x+margin,y+margin,sidelen,sidelen);

-                                        DrawRectangle(UNROLLXYWH(elem->xywh),((Color){0,0,0,64}));

+                                        FILLXYWH(elem->right.xywh,x+margin,y+margin,sidelen,sidelen);

+                                        DrawRectangle(UNROLLXYWH(elem->right.xywh),((Color){0,0,0,64}));

                                 }

                                 {

                                         char *ptr;

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

                                         Texture2D *te;

                                         int *has_texture;

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

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

-                                        te=is_leftside?&(elem->lefttexture):&(elem->texture);

-                                        has_texture=is_leftside?&(elem->has_lefttexture):&(elem->has_texture);

+                                        pos=is_leftside?&(elem->left.xywh):&(elem->right.xywh);

+                                        te=is_leftside?&(elem->left.texture):&(elem->right.texture);

+                                        has_texture=is_leftside?&(elem->left.has_texture):&(elem->right.has_texture);

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

                                                 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 });

@@ -933,13 +939,17 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                                 }

                                                 if(*has_texture!=0) {

                                                         DrawTexture(*te,pos->x,pos->y,WHITE);

-                                                        if(is_leftside && is_imutil_insidexywh(mousepos,pos)) {

+                                                        if(is_leftside && lmbdown==0 && is_imutil_insidexywh(mousepos,pos)) {

                                                                 /* draw image in rightside */

                                                                 char path[2048];

+                                                                int maxw,maxh;

                                                                 snprintf(path,sizeof(path),"%s/%s",dirdata->dirname,elem->name+1);

                                                                 path[sizeof(path)-1]='\0';

+                                                                maxw=windowwidth-(body->leftsize-DEFAULTDIRDATATRIANGLEW);

+                                                                maxh=windowheight-body->xywh.y;

                                                                 if(body->has_texture==0 || strcmp(body->currenttexture,path)!=0) {

                                                                         Image im;

+                                                                        int neww,newh;

                                                                         char fullpath[2048];

                                                                         if(body->has_texture) {

                                                                                 UnloadTexture(body->texture);

@@ -949,15 +959,22 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                                                         fullpath[sizeof(fullpath)-1]='\0';

                                                                         im=LoadImage(fullpath);

                                                                         if(IsImageValid(im)) {

-                                                                                ImageResize(&im,windowwidth-body->leftsize,windowheight-body->xywh.y);

+                                                                                im_util_aspectmaximize(im.width,im.height,maxw,maxh,&neww,&newh);

+                                                                                ImageResize(&im,neww,newh);

                                                                                 body->texture=LoadTextureFromImage(im);

                                                                                 UnloadImage(im);

                                                                                 body->has_texture=1;

+                                                                                body->texturew=neww;

+                                                                                body->textureh=newh;

                                                                         }

                                                                 }

                                                                 if(body->has_texture) {

-                                                                       DrawTexture(body->texture,body->leftsize,body->xywh.y,WHITE);

-                                                                       flag_skiprightside=1;

+                                                                        int x0,y0;

+                                                                        x0=body->leftsize-DEFAULTDIRDATATRIANGLEW;

+                                                                        y0=body->xywh.y;

+                                                                        DrawRectangle(x0,y0,maxw,maxh,(Color){ 215, 215, 215, 255 } );

+                                                                        DrawTexture(body->texture,x0+(maxw-body->texturew)/2,y0+(maxh-body->textureh)/2,WHITE);

+                                                                        flag_skiprightside=1;

                                                                 }

                                                         }

                                                 }

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

                         }

                         /* ...finishing touchs */

                         if(is_leftside) {

-                                /* draw right side "current" marker inside left side area */

-                                DrawTriangle((Vector2){((float)body->xywh.x)+body->leftsize,((float)righty)}, (Vector2){((float)body->xywh.x)+body->leftsize-DEFAULTDIRDATATRIANGLEW,((float)righty)+dirdata->height/2}, (Vector2){((float)body->xywh.x)+body->leftsize,((float)righty)+dirdata->height-1}, (Color){ 168, 168, 168, 255 } );

+                                ;

                         } else {

+                                if(i==body->currentdirdata) {

+                                        /* draw right side "current" marker inside left side area */

+                                        DrawTriangle((Vector2){((float)body->xywh.x)+body->leftsize,((float)righty)}, (Vector2){((float)body->xywh.x)+body->leftsize-DEFAULTDIRDATATRIANGLEW,((float)righty)+dirdata->height/2}, (Vector2){((float)body->xywh.x)+body->leftsize,((float)righty)+dirdata->height-1}, (Color){ 168, 168, 168, 255 } );

+                                }

                                 /* advance to next element */

                                 righty+=dirdata->height;

                         }

@@ -1092,6 +1112,22 @@ is_imutil_insidexywh(Vector2 pos, xywh_t *xywh)

         return(0);

 }

+int

+im_util_aspectmaximize(int w, int h, int maxw, int maxh, int *neww, int *newh)

+{

+        if(neww==NULL || newh==NULL || w==0 || h==0 || maxw==0 || maxh==0)

+                return(-1);

+        if((w/h)>(maxw/maxh)) {

+                *neww=maxw;

+                *newh=h*maxw/w;

+        } else { /* (w/h)<=(maxw/maxh) */

+                *newh=maxh;

+                *neww=w*maxh/h;

+        }

+        return(0);

+}

+

+

 int

 menudata_pos2option(menudata_t *menudata, Vector2 pos)

 {

@@ -1143,13 +1179,13 @@ listing_get(listing_t *listing, char *pathprefix, char *parampath, int flag_sort

         /* free old textures */

         for(i=0;i<listing->usedelems;i++) {

                 ld=listing->elems+i;

-                if(ld->has_lefttexture) {

-                        UnloadTexture(ld->lefttexture);

-                        ld->has_lefttexture=0;

+                if(ld->left.has_texture) {

+                        UnloadTexture(ld->left.texture);

+                        ld->left.has_texture=0;

                 }

-                if(ld->has_texture) {

-                        UnloadTexture(ld->texture);

-                        ld->has_texture=0;

+                if(ld->right.has_texture) {

+                        UnloadTexture(ld->right.texture);

+                        ld->right.has_texture=0;

                 }

         }

         /* reset struct */

@@ -1250,13 +1286,13 @@ listing_freedata(listing_t *listing)

                 listingdata_t *ld;

                 for(i=0;i<listing->usedelems;i++) {

                         ld=listing->elems+i;

-                        if(ld->has_lefttexture) {

-                                UnloadTexture(ld->lefttexture);

-                                ld->has_lefttexture=0;

+                        if(ld->left.has_texture) {

+                                UnloadTexture(ld->left.texture);

+                                ld->left.has_texture=0;

                         }

-                        if(ld->has_texture) {

-                                UnloadTexture(ld->texture);

-                                ld->has_texture=0;

+                        if(ld->right.has_texture) {

+                                UnloadTexture(ld->right.texture);

+                                ld->right.has_texture=0;

                         }

                 }

                 free(listing->elems),listing->elems=NULL,listing->sizeelems=listing->usedelems=0;