@@ -749,7 +749,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long wParam, long lParam) {
749749 }
750750 }
751751 }
752- rect .left += INSET - 1 ;
752+ rect .left += Win32DPIUtils . pointToPixel ( INSET - 1 , zoom ) ;
753753 if (drawImage ) {
754754 Image image = null ;
755755 if (index == 0 ) {
@@ -758,8 +758,8 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long wParam, long lParam) {
758758 Image [] images = item .images ;
759759 if (images != null ) image = images [index ];
760760 }
761- int inset = i != 0 ? INSET : 0 ;
762- int offset = i != 0 ? INSET : INSET + 2 ;
761+ int inset = i != 0 ? Win32DPIUtils . pointToPixel ( INSET , zoom ) : 0 ;
762+ int offset = i != 0 ? Win32DPIUtils . pointToPixel ( INSET , zoom ) : Win32DPIUtils . pointToPixel ( INSET + 2 , zoom ) ;
763763 if (image != null ) {
764764 Rectangle bounds = image .getBounds (); // Points
765765 if (size == null ) size = Win32DPIUtils .pixelToPoint (getImageSize (), zoom ); // To Points
@@ -5484,7 +5484,7 @@ public void showColumn (TreeColumn column) {
54845484 SCROLLINFO info = new SCROLLINFO ();
54855485 info .cbSize = SCROLLINFO .sizeof ;
54865486 info .fMask = OS .SIF_POS ;
5487- info .nPos = Math .max (0 , headerRect .left - Tree . INSET / 2 );
5487+ info .nPos = Math .max (0 , headerRect .left - Win32DPIUtils . pointToPixel ( INSET / 2 , getZoom ()) );
54885488 OS .SetScrollInfo (hwndParent , OS .SB_HORZ , info , true );
54895489 setScrollWidth ();
54905490 } else if (scrollBecauseRight ) {
@@ -5498,8 +5498,8 @@ public void showColumn (TreeColumn column) {
54985498 // info.nPos + wideRect = headerRect.left + wideHeader
54995499 // info.nPos = headerRect.left + wideHeader - wideRect
55005500 info .nPos = Math .max (0 , wideHeader + headerRect .left - wideRect
5501- - Tree . INSET / 2 );
5502- info .nPos = Math .min (rect .right - Tree . INSET / 2 , info .nPos );
5501+ - Win32DPIUtils . pointToPixel ( INSET / 2 , getZoom ()) );
5502+ info .nPos = Math .min (rect .right - Win32DPIUtils . pointToPixel ( INSET / 2 , getZoom ()) , info .nPos );
55035503
55045504 OS .SetScrollInfo (hwndParent , OS .SB_HORZ , info , true );
55055505 setScrollWidth ();
@@ -7925,7 +7925,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long wParam, long lParam) {
79257925 }
79267926 }
79277927
7928- int x = rects [i ].left + INSET + 2 ;
7928+ int x = rects [i ].left + Win32DPIUtils . pointToPixel ( INSET + 2 , getZoom ()) ;
79297929 if (columns [i ].image != null ) {
79307930 GCData data = new GCData ();
79317931 data .device = display ;
@@ -8243,7 +8243,7 @@ LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long lParam) {
82438243 data .background = OS .GetBkColor (nmcd .hdc );
82448244 data .font = Font .win32_new (display , hFont );
82458245 GC gc = createNewGC (nmcd .hdc , data );
8246- int x = cellRect [0 ].left + INSET ;
8246+ int x = cellRect [0 ].left + Win32DPIUtils . pointToPixel ( INSET , getZoom ()) ;
82478247 if (index [0 ] != 0 ) x -= gridWidth ;
82488248 Image image = item [0 ].getImage (index [0 ]);
82498249 if (image != null || index [0 ] == 0 ) {
@@ -8254,11 +8254,11 @@ LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long lParam) {
82548254 Rectangle rect = image .getBounds (); // Points
82558255 int zoom = getZoom ();
82568256 gc .drawImage (image , rect .x , rect .y , rect .width , rect .height , DPIUtil .pixelToPoint (x , zoom ), DPIUtil .pixelToPoint (imageRect .top , zoom ), DPIUtil .pixelToPoint (size .x , zoom ), DPIUtil .pixelToPoint (size .y , zoom ));
8257- x += INSET + (index [0 ] == 0 ? 1 : 0 );
8257+ x += Win32DPIUtils . pointToPixel ( INSET , getZoom ()) + (index [0 ] == 0 ? 1 : 0 );
82588258 }
82598259 x += size .x ;
82608260 } else {
8261- x += INSET ;
8261+ x += Win32DPIUtils . pointToPixel ( INSET , getZoom ()) ;
82628262 }
82638263 String string = item [0 ].getText (index [0 ]);
82648264 if (string != null ) {
0 commit comments