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