From b0d72a3db269e758bf77330bba8c0e925ef01c4a Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Tue, 1 Jul 2003 23:00:25 +0000
Subject: [PATCH] - Fixed aspect of window list menu (window name was too close
 to workspace   indicator) - Fixed menu panel in WPrefs.app. Explanatory text
 did not fit into the label

---
 ChangeLog         |  3 +++
 WPrefs.app/Menu.c | 10 ++++------
 src/dialog.c      |  6 +++---
 src/menu.c        |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 18c1d652..ca8e08b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,9 @@ Changes since version 0.80.2:
   (Peter Zijlstra <a.p.zijlstra@chello.nl>)
 - Fixed the 'KDE omnipresent' bug.
 - Fixed bug with focusing a deminiaturized window with sloppy focus mode
+- Fixed aspect of window list menu (window name was too close to workspace
+  indicator)
+- Fixed menu panel in WPrefs.app. Explanatory text did not fit into the label
 
 
 Changes since version 0.80.1:
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index dcfc0806..c6450cef 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -887,13 +887,11 @@ createPanel(_Panel *p)
     WMMoveWidget(panel->quickB, 10, 120);
     WMSetButtonText(panel->quickB, _("Do not confirm action."));
     WMSetButtonAction(panel->quickB, buttonClicked, panel);
-    
-    
-    
-    
+
+
     label = WMCreateLabel(panel->optionsF);
-    WMResizeWidget(label, width - 10, FRAME_HEIGHT - 50);
-    WMMoveWidget(label, 10, 20);
+    WMResizeWidget(label, width+5, FRAME_HEIGHT - 50);
+    WMMoveWidget(label, 7, 20);
     WMSetLabelText(label, 
 		   _("Instructions:\n\n"
 		     " - drag items from the left to the menu to add new items\n"
diff --git a/src/dialog.c b/src/dialog.c
index bff2010b..8ccfe020 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1910,7 +1910,7 @@ wShowGNUstepPanel(WScreen *scr)
     panel->scr = scr;
 
     panel->win = WMCreateWindow(scr->wmscreen, "About GNUstep");
-    WMResizeWidget(panel->win, 325, 200);
+    WMResizeWidget(panel->win, 325, 205);
 
     pixmap = WMCreatePixmap(scr->wmscreen, 130, 130,
 			    WMScreenDepth(scr->wmscreen), True);
@@ -1940,8 +1940,8 @@ wShowGNUstepPanel(WScreen *scr)
     }
 
     panel->textL = WMCreateLabel(panel->win);
-    WMResizeWidget(panel->textL, 275, 130);
-    WMMoveWidget(panel->textL, 30, 50);
+    WMResizeWidget(panel->textL, 305, 140);
+    WMMoveWidget(panel->textL, 10, 50);
     WMSetLabelTextAlignment(panel->textL, WARight);
     WMSetLabelImagePosition(panel->textL, WIPOverlaps);
     WMSetLabelText(panel->textL,
diff --git a/src/menu.c b/src/menu.c
index 559e52cb..8d659580 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -571,7 +571,7 @@ wMenuRealize(WMenu *menu)
         text = menu->entries[i]->rtext;
         if (text)
             rwidth = WMWidthOfString(scr->menu_entry_font, text, strlen(text))
-                + 5;
+                + 10;
         else if (menu->entries[i]->cascade>=0)
             rwidth = 16;
         else