@@ -21,6 +21,7 @@

  *      20250305 Scrollable left pane.

  *      20250308 Show statustooltip on image hover.

  *               Scrollwheel support for leftside.

+ *               Fix thumb aspect ratio.

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -222,7 +223,7 @@ char *imutil_menu_get(char *menus, int targetn, int *len);

 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 is_imutil_insidexywh(Vector2 pos, xywh_t *xywh, int margin);

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

@@ -494,7 +495,7 @@ im_menubar_mouse(menubar_t *menubar, Vector2 mousepos, int lmbpressed, int lmbre

         flag_outsideall=1;

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

                 int insidetitle,currentoption;

-                insidetitle=is_imutil_insidexywh(mousepos,&(menubar->menudata[i]->xywh));

+                insidetitle=is_imutil_insidexywh(mousepos,&(menubar->menudata[i]->xywh),0);

                 currentoption=menudata_pos2option(menubar->menudata[i],mousepos);

                 flag_outsideall=(currentoption!=-1 || insidetitle)?0:flag_outsideall;

                 if(lmbreleased && insidetitle) {

@@ -730,7 +731,7 @@ im_body_mouse(body_t *body, Vector2 mousepos, Vector2 wheel, int lmbpressed, int

         if(*click_avail==0 || lmbreleased==0)

                 return(0); /* nothing else to do */

         /* leftside backbutton */

-        if(is_imutil_insidexywh(mousepos,&(body->backxywh))) {

+        if(is_imutil_insidexywh(mousepos,&(body->backxywh),0)) {

                 static char sep[]={SEP};

                 if((ptr=strrchr(dirdata->dirname,sep[0]))!=NULL) {

                         /* previous dir */

@@ -749,7 +750,7 @@ im_body_mouse(body_t *body, Vector2 mousepos, Vector2 wheel, int lmbpressed, int

                 ld=dirdata->listing.elems+i;

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

                         continue;

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

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

                         char *newname,*oldprefix;

                         int l,l0,l1;

                         static char sep[]={SEP};

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

 #warning TODO: if !is_leftside, draw "..." in huge font using lastx,lasty as reference

                                         break;

                                 }

-                                if(is_leftside && is_imutil_insidexywh(mousepos,&(thumb->screenxywh))) {

+                                if(is_leftside && is_imutil_insidexywh(mousepos,&(thumb->screenxywh),margin)) {

                                         strncpy(statustooltip,elem->name+1,sizeof(statustooltip));

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

                                 }

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

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

                                                 im=LoadImage(fullpath);

                                                 if(IsImageValid(im)) {

+                                                        int neww,newh;

+                                                        Image im2,impixel;

 #if 1

 fprintf(stderr,"Loaded %s\n",fullpath);

+{

+int oldw=im.width,oldh=im.height;

+#endif

+                                                        im2=GenImageColor(sidelen,sidelen,(Color){0,0,0,255});

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

+                                                        ImageResize(&im,neww,newh);

+                                                        impixel=ImageCopy(im);

+                                                        ImageResize(&impixel,1,1);

+#if 1

+if(neww>sidelen || newh>sidelen)

+fprintf(stderr,"elem:\"%s\" sidelen:%i old:%ix%i new:%ix%i\n",elem->name+1,sidelen,oldw,oldh,neww,newh);

+}

 #endif

-                                                        ImageResize(&im,sidelen,sidelen);

-                                                        *te=LoadTextureFromImage(im);

+                                                        ImageDraw(&im2,impixel,(Rectangle) {0,0,1,1},(Rectangle) {0,0,sidelen,sidelen},(Color){255,255,255,255});

+                                                        ImageDraw(&im2,im,(Rectangle) {0,0,neww,newh},(Rectangle) {(sidelen-neww)/2,(sidelen-newh)/2,neww,newh},(Color){255,255,255,255});

+                                                        *te=LoadTextureFromImage(im2);

                                                         UnloadImage(im);

+                                                        UnloadImage(im2);

                                                         thumb->has_texture=1;

                                                 }

                                         }

@@ -945,7 +962,7 @@ fprintf(stderr,"Loaded %s\n",fullpath);

                                                 DrawTexture(*te,thumb->screenxywh.x,thumb->screenxywh.y,WHITE);

                                                 has_imagedrawn=1;

                                                 lastx=xywh->x+xywh->w,lasty=xywh->y+xywh->h+yoff;

-                                                if(is_leftside && lmbdown==0 && is_imutil_insidexywh(mousepos,&(thumb->screenxywh))) {

+                                                if(is_leftside && lmbdown==0 && is_imutil_insidexywh(mousepos,&(thumb->screenxywh),margin)) {

                                                         /* draw image in rightside */

                                                         char path[2048];

                                                         int maxw,maxh;

@@ -1149,14 +1166,14 @@ imutil_strduplen(char *str, int len)

 }

 int

-is_imutil_insidexywh(Vector2 pos, xywh_t *xywh)

+is_imutil_insidexywh(Vector2 pos, xywh_t *xywh, int margin)

 {

         if(xywh==NULL)

                 return(0); /* sanity check error */

-        if(pos.x>=(float)(xywh->x)

-          && pos.x<=(float)(xywh->x+xywh->w)

-          && pos.y>=(float)(xywh->y)

-          && pos.y<=(float)(xywh->y+xywh->h)

+        if(pos.x>=(float)(xywh->x-margin)

+          && pos.x<=(float)(xywh->x+xywh->w+margin)

+          && pos.y>=(float)(xywh->y-margin)

+          && pos.y<=(float)(xywh->y+xywh->h+margin)

         ) {

                 return(1);

         }

@@ -1168,7 +1185,7 @@ 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)) {

+        if((w/h)>(maxw/maxh) || (maxw==maxh && w>h)) {

                 *neww=maxw;

                 *newh=h*maxw/w;

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

@@ -1185,7 +1202,7 @@ menudata_pos2option(menudata_t *menudata, Vector2 pos)

         int n,h;

         if(menudata==NULL

           || (menudata->flag_open==0 && menudata->flag_stickyopen==0)

-          || is_imutil_insidexywh(pos, &(menudata->optionsxywh))==0

+          || is_imutil_insidexywh(pos, &(menudata->optionsxywh),0)==0

         ) {

                 return(-1);

         }