From 12b8b8ba58d99a9a53b90fde904a3d870dc61a0e Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Mon, 25 Oct 2004 00:42:25 +0000
Subject: [PATCH] bug fix

---
 WindowMaker/Defaults/WindowMaker.in | 10 +++++-----
 src/switchpanel.c                   |  4 ++--
 src/wconfig.h.in                    | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in
index a11f8da3..2a64a7bf 100644
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -105,12 +105,12 @@
   ConstrainWindowSize = NO;
   ClipRaiseLowerKey = None;
   TitleJustify = center;
-  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
-  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
-  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=11";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=11";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=11";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=8";
   ClipTitleFont = "Verdana:bold:pixelsize=10";
-  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=11";
   LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   HighlightColor = white;
   HighlightTextColor = black;
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 27643fef..d4de1874 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -460,7 +460,7 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace)
 
     panel->tileTmp= RCreateImage(ICON_TILE_SIZE, ICON_TILE_SIZE, 1);
     panel->tile= getTile(panel);
-    if (panel->tile) {
+    if (panel->tile && wPreferences.swbackImage[8]) {
         panel->bg= createBackImage(scr, width+2*BORDER_SPACE, height+2*BORDER_SPACE);
     }
     if (!panel->tileTmp || !panel->tile) {
@@ -524,7 +524,7 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace)
     if (panel->bg) {
         Pixmap pixmap, mask;
 
-        RConvertImageMask(scr->rcontext, panel->bg, &pixmap, &mask, 254);
+        RConvertImageMask(scr->rcontext, panel->bg, &pixmap, &mask, 250);
 
         XSetWindowBackgroundPixmap(dpy, WMWidgetXID(panel->win), pixmap);
 
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 299efa16..4d8e35ef 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -269,12 +269,12 @@
 #define DEF_FRAME_COLOR   "white"
 
 
-#define DEF_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
-#define DEF_MENU_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
-#define DEF_MENU_ENTRY_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
-#define DEF_ICON_TITLE_FONT "\"Arial,Luxi Sans:pixelsize=9\""
+#define DEF_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=11\""
+#define DEF_MENU_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=11\""
+#define DEF_MENU_ENTRY_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=11\""
+#define DEF_ICON_TITLE_FONT "\"Arial,Luxi Sans:pixelsize=8\""
 #define DEF_CLIP_TITLE_FONT "\"Verdana:bold:pixelsize=10\""
-#define DEF_INFO_TEXT_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
+#define DEF_INFO_TEXT_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=11\""
 
 #define DEF_WORKSPACE_NAME_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=24\""
 
-- 
2.11.4.GIT