Changeset 1317 in Sophya for trunk/SophyaPI

Timestamp:

Nov 10, 2000, 2:28:45 PM (25 years ago)

Author:

ercodmgr

Message:

modifs cosmetiques - Reza 10/11/2000

Location:

trunk/SophyaPI/PI

Files:

• piimgtools.cc (modified) (4 diffs)
• piwdgx.cc (modified) (3 diffs)

trunk/SophyaPI/PI/piimgtools.cc

@@ -211 +211 @@
 mOptCut->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
-int pbsx = bsy;
+int pbsx = 0.45*bsx;
 int pbsy = bsy;
 int pspx = spy/2;
 int pspy = spy;
 
-cpx = 2*spx;
+cpx = spx;
 cpy += bsy+spy;
 mButsz[0] = new PIButton(this, "1x1", 3201,  pbsx, pbsy, cpx, cpy);
@@ -234 +234 @@
 
 //cpx += pbsx+10*pspx;
-cpx = wszx-3.0*pbsx-2*spx-pspx;
+cpx = wszx-3.0*pbsx-spx-pspx;
 mButoa[0] = new PIButton(this, "+Info", 5311,  1.5*pbsx, pbsy, cpx, cpy);
 mButoa[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
@@ -242 +242 @@
 
 
-cpx = 2*spx;
+cpx = spx;
 cpy += pbsy+pspy;
 mButcax[0] = new PIButton(this, "-X", 5201,  pbsx, pbsy, cpx, cpy);
@@ -254 +254 @@
 
 // cpx += 1.5*pbsx+pspx+10*pspx;
-cpx = wszx-4.5*pbsx-2*spx-2*pspx;
+cpx = wszx-4.5*pbsx-spx-2*pspx;
 mButoa[2] = new PIButton(this, "-All", 5300,  1.5*pbsx, pbsy, cpx, cpy);
 mButoa[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);

trunk/SophyaPI/PI/piwdgx.cc

@@ -625 +625 @@
 "PeidaInt*XmText*highlightThickness:          0",
 "PeidaInt*XmText*marginHeigt:                 0",
-"PeidaInt*XmText*marginWidth:                 3",
+"PeidaInt*XmText*marginWidth:                 2",
 // "PeidaInt*DefMenubar*XtNwidth:                250",
 // "PeidaInt*DefMenubar*XtNheight:               30",
@@ -690 +690 @@
 list = XListFonts(dpy, buff, 15, &count);
 if (count < 1)  { 
-  strcpy(buff,"-*-*-*-*-*-*-*-*-*-*-*-*-*-*" );
+  strcpy(buff,"-*-*-*-*-*-*-12-*-*-*-*-*-*-*" );
+  XFreeFontNames(list);
+  list = XListFonts(dpy, buff, 15, &count);
+  }
+if (count < 1)  { 
+  strcpy(buff,"-*-*-*-*-*-*-13-*-*-*-*-*-*-*" );
+  XFreeFontNames(list);
+  list = XListFonts(dpy, buff, 15, &count);
+  }
+if (count < 1)  { 
+  strcpy(buff,"-*-*-*-*-*-*-11-*-*-*-*-*-*-*" );
   XFreeFontNames(list);
   list = XListFonts(dpy, buff, 15, &count);
@@ -723 +733 @@
 XTextExtents(stdfnt, a, 0, &hd, &fa, &fd, &ovr);
 len = XTextWidth(stdfnt, "CANCEL", 6);
-appSzY = (float)(fa+fd)*1.5+8;  // pour les shadow  $CHECK$ - a ameliorer peut-etre 
-appSzX = (float)len*1.5;
+appSzY = (float)(fa+fd)*1.4+8;  // pour les shadow  $CHECK$ - a ameliorer peut-etre 
+appSzX = (float)len*1.4;
 appSzFont =  mySzFont ;
 // Taille X multiple de 5 pixels, Y mult 2 pixels