From 86154ba01d55677181f69ff10fa0cab543935580 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Wed, 25 Apr 2001 02:03:08 +0000
Subject: [PATCH] A few miscelaneous fixes

---
 WINGs/wbox.c                   | 15 ++++++++++-----
 WINGs/wbutton.c                |  2 +-
 WPrefs.app/Appearance.c        |  2 +-
 WPrefs.app/Configurations.c    |  2 +-
 WPrefs.app/Expert.c            |  2 +-
 WPrefs.app/Focus.c             |  2 +-
 WPrefs.app/Font.c              |  2 +-
 WPrefs.app/Icons.c             |  2 +-
 WPrefs.app/KeyboardSettings.c  |  2 +-
 WPrefs.app/KeyboardShortcuts.c |  2 +-
 WPrefs.app/Menu.c              |  4 ++--
 WPrefs.app/MenuPreferences.c   |  2 +-
 WPrefs.app/MouseSettings.c     |  8 ++++----
 WPrefs.app/Paths.c             |  2 +-
 WPrefs.app/Preferences.c       |  2 +-
 WPrefs.app/Themes.c            |  2 +-
 WPrefs.app/WPrefs.h            |  4 ++--
 WPrefs.app/Workspace.c         |  2 +-
 src/event.c                    |  3 +--
 19 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/WINGs/wbox.c b/WINGs/wbox.c
index 9873eaea..f11de212 100644
--- a/WINGs/wbox.c
+++ b/WINGs/wbox.c
@@ -152,9 +152,10 @@ rearrange(WMBox *box)
 void
 WMSetBoxBorderWidth(WMBox *box, unsigned width)
 {
-    box->borderWidth = width;
-    
-    rearrange(box);
+    if (box->borderWidth != width) {
+        box->borderWidth = width;
+        rearrange(box);
+    }
 }
 
 
@@ -227,8 +228,12 @@ WMRemoveBoxSubview(WMBox *bPtr, WMView *view)
 void
 WMSetBoxHorizontal(WMBox *box, Bool flag)
 {
-    box->horizontal = flag;
-    rearrange(box);
+    /* make sure flag is either 0 or 1 no matter what true value was passed */
+    flag = ((flag==0) ? 0 : 1);
+    if (box->horizontal != flag) {
+        box->horizontal = flag;
+        rearrange(box);
+    }
 }
 
 
diff --git a/WINGs/wbutton.c b/WINGs/wbutton.c
index 48f7c91b..58cd7b05 100644
--- a/WINGs/wbutton.c
+++ b/WINGs/wbutton.c
@@ -650,7 +650,7 @@ paintButton(Button *bPtr)
 	}
     }
 
-    W_PaintTextAndImage(bPtr->view, False, WMColorGC(textColor),
+    W_PaintTextAndImage(bPtr->view, True, WMColorGC(textColor),
 			(bPtr->font!=NULL ? bPtr->font : scrPtr->normalFont),
 			relief, caption, bPtr->flags.alignment, image, 
 			bPtr->flags.imagePosition, gc, offset);
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 86ea0485..73c4e894 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -1723,7 +1723,7 @@ createPanel(Panel *p)
     panel->hand = WMCreatePixmapFromXPMData(scr, hand_xpm);
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
     /* preview box */
     panel->prevL = WMCreateLabel(panel->box);
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index e4c0d459..906648b7 100644
--- a/WPrefs.app/Configurations.c
+++ b/WPrefs.app/Configurations.c
@@ -193,7 +193,7 @@ createPanel(Panel *p)
 
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
     /*********** Icon Slide Speed **********/
     
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index 8ec54a8c..a3cbe174 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -64,7 +64,7 @@ createPanel(Panel *p)
     int i;
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
     for (i=0; i<7; i++) {
 	panel->swi[i] = WMCreateSwitchButton(panel->box);
diff --git a/WPrefs.app/Focus.c b/WPrefs.app/Focus.c
index be3942ba..05eca76f 100644
--- a/WPrefs.app/Focus.c
+++ b/WPrefs.app/Focus.c
@@ -239,7 +239,7 @@ createPanel(Panel *p)
     WMFont *font;
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
     /***************** Input Focus Mode *****************/
     panel->kfocF = WMCreateFrame(panel->box);
diff --git a/WPrefs.app/Font.c b/WPrefs.app/Font.c
index 5dae7a8d..aca26f49 100644
--- a/WPrefs.app/Font.c
+++ b/WPrefs.app/Font.c
@@ -358,7 +358,7 @@ createPanel(Panel *p)
     
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
 
     panel->prevL = WMCreateLabel(panel->box);
diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c
index 62fa0643..06d53d03 100644
--- a/WPrefs.app/Icons.c
+++ b/WPrefs.app/Icons.c
@@ -171,7 +171,7 @@ createPanel(Panel *p)
 
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
     /***************** Positioning of Icons *****************/
     panel->posF = WMCreateFrame(panel->box);
diff --git a/WPrefs.app/KeyboardSettings.c b/WPrefs.app/KeyboardSettings.c
index b3582384..5538f164 100644
--- a/WPrefs.app/KeyboardSettings.c
+++ b/WPrefs.app/KeyboardSettings.c
@@ -64,7 +64,7 @@ createPanel(Panel *p)
     font = WMSystemFontOfSize(scr, 10);
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
     /**************** Initial Key Repeat ***************/
     panel->delaF = WMCreateFrame(panel->box);
diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c
index c460fcfa..bdd5a927 100644
--- a/WPrefs.app/KeyboardShortcuts.c
+++ b/WPrefs.app/KeyboardShortcuts.c
@@ -350,7 +350,7 @@ createPanel(Panel *p)
 
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
     boldFont = WMBoldSystemFontOfSize(scr, 12);
 
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index e18b9f0a..2080d347 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -468,7 +468,7 @@ createPanel(_Panel *p)
     }
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
     panel->typeP = WMCreatePopUpButton(panel->box);
     WMResizeWidget(panel->typeP, 150, 20);
@@ -628,7 +628,7 @@ createPanel(_Panel *p)
     }
 
 
-    width = FRAME_WIDTH - 20 - 150 - 10;
+    width = FRAME_WIDTH - 20 - 150 - 10 - 2;
 
     panel->optionsF = WMCreateFrame(panel->box);
     WMResizeWidget(panel->optionsF, width, FRAME_HEIGHT - 15);
diff --git a/WPrefs.app/MenuPreferences.c b/WPrefs.app/MenuPreferences.c
index 9d66d942..6e75ede8 100644
--- a/WPrefs.app/MenuPreferences.c
+++ b/WPrefs.app/MenuPreferences.c
@@ -103,7 +103,7 @@ createPanel(Panel *p)
     char *path;
     
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
     /***************** Menu Scroll Speed ****************/
     panel->scrF = WMCreateFrame(panel->box);
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index e1b42b07..15d4863d 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -448,12 +448,12 @@ createPanel(Panel *p)
     RColor color;
     char *path;
 
-    color.red = 0xaa;
-    color.green = 0xae;
-    color.blue = 0xaa;
+    color.red = 0xae;
+    color.green = 0xaa;
+    color.blue = 0xae;
     
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
     /**************** Mouse Speed ****************/
     panel->speedF = WMCreateFrame(panel->box);
diff --git a/WPrefs.app/Paths.c b/WPrefs.app/Paths.c
index a8e1585a..b9754ac5 100644
--- a/WPrefs.app/Paths.c
+++ b/WPrefs.app/Paths.c
@@ -250,7 +250,7 @@ createPanel(Panel *p)
     panel->font = WMSystemFontOfSize(scr, 12);
     
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
     
     panel->tabv = WMCreateTabView(panel->box);
diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c
index 38ad8b03..e2ccedb1 100644
--- a/WPrefs.app/Preferences.c
+++ b/WPrefs.app/Preferences.c
@@ -209,7 +209,7 @@ createPanel(Panel *p)
     int i;
     
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
     
     /***************** Size Display ****************/
diff --git a/WPrefs.app/Themes.c b/WPrefs.app/Themes.c
index 81a0b14e..3d5c5c06 100644
--- a/WPrefs.app/Themes.c
+++ b/WPrefs.app/Themes.c
@@ -163,7 +163,7 @@ createPanel(Panel *p)
     _Panel *panel = (_Panel*)p;
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
     panel->saveB = WMCreateCommandButton(panel->box);
     WMResizeWidget(panel->saveB, 154, 24);
diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h
index 42a3724c..0815da69 100644
--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -113,8 +113,8 @@ void AddDeadChildHandler(pid_t pid, void (*handler)(void*), void *data);
 
 
 #define FRAME_TOP	105
-#define FRAME_LEFT	-1
-#define FRAME_WIDTH	522
+#define FRAME_LEFT	-2
+#define FRAME_WIDTH	524
 #define FRAME_HEIGHT	235
 
 
diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c
index 2e4430c8..3122aeea 100644
--- a/WPrefs.app/Workspace.c
+++ b/WPrefs.app/Workspace.c
@@ -167,7 +167,7 @@ createPanel(Panel *p)
     }
 
     panel->box = WMCreateBox(panel->parent);
-    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 0, 0);
+    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
     
     /***************** Workspace Navigation *****************/
     panel->navF = WMCreateFrame(panel->box);
diff --git a/src/event.c b/src/event.c
index b140091e..7e6dd3fe 100644
--- a/src/event.c
+++ b/src/event.c
@@ -631,8 +631,7 @@ handleButtonPress(XEvent *event)
 	} else if (event->xbutton.button==wPreferences.select_button) {
 	    wUnselectWindows(scr);
 	    wSelectWindows(scr, event);
-	}
-	else if (event->xbutton.button==Button5) {
+	} else if (event->xbutton.button==Button5) {
 	    wWorkspaceRelativeChange(scr, -1);
 	} else if (event->xbutton.button==Button4) {
 	    wWorkspaceRelativeChange(scr, 1);
-- 
2.11.4.GIT