59a63e
commit 33e0b7fd58ec8ce9fd23d3a66a91e9b4b7c2b928
59a63e
Author: Oleksiy Chernyavskyy <ochern@ics.com>
59a63e
Date:   Fri Jun 10 23:15:00 2016 +0300
59a63e
59a63e
    bug 1654 fix
59a63e
59a63e
diff --git a/lib/Xm/LabelG.c b/lib/Xm/LabelG.c
59a63e
index b674041..726b095 100644
59a63e
--- a/lib/Xm/LabelG.c
59a63e
+++ b/lib/Xm/LabelG.c
59a63e
@@ -35,6 +35,7 @@ static char rcsid[] = "$TOG: LabelG.c /main/24 1999/01/26 15:31:18 mgreess $"
59a63e
 #include <config.h>
59a63e
 #endif
59a63e
 #define FIX_1517
59a63e
+#define FIX_1654
59a63e
 
59a63e
 #include <string.h>
59a63e
 #include <stdio.h>
59a63e
@@ -2352,12 +2353,20 @@ LRectangle *background_box)
59a63e
     if (LabG_StringRect(lw).width < availW - marginal_width)
59a63e
     	width = LabG_StringRect(lw).width;
59a63e
     else
59a63e
+#ifdef FIX_1654
59a63e
+    	width = availW - marginal_width;
59a63e
+#else
59a63e
     	width = availW - marginal_width - x;
59a63e
+#endif
59a63e
 
59a63e
     if (LabG_StringRect(lw).height < availH - marginal_height)
59a63e
     	height = LabG_StringRect(lw).height;
59a63e
     else
59a63e
+#ifdef FIX_1654
59a63e
+    	height = availH - marginal_height;
59a63e
+#else
59a63e
     	height = availH - marginal_height - y;
59a63e
+#endif
59a63e
     
59a63e
     XFillRectangle(XtDisplay(lw), XtWindow(lw), LabG_BackgroundGC(lw),
59a63e
 		x, y, width, height);