From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Tue, 10 Apr 2012 15:54:33 +0000 (+0200)
Subject: Fix vertical chaining of Buttons and browser ListBoxes
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=fda0f178b9357faee596c04d5e5ceebf47642d9f;p=xboard.git

Fix vertical chaining of Buttons and browser ListBoxes
---

diff --git a/dialogs.c b/dialogs.c
index a6698ca..12b668a 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -2106,10 +2106,10 @@ Option browseOptions[] = {
 {   0,    LR|T2T,      500, NULL, NULL, NULL, NULL, Label, title },
 {   0,    L2L|T2T,     250, NULL, NULL, NULL, NULL, Label, N_("Directories:") },
 {   0,R2R|T2T|SAME_ROW,100, NULL, NULL, NULL, NULL, Label, N_("Files:") },
-{   0,R2R|T2T|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by name") },
-{   0,R2R|T2T|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by type") },
-{ 300,    L2L|T2T,     250, NULL, (void*) folderList, (char*) &DirSelProc, NULL, ListBox, "" },
-{ 300,R2R|T2T|SAME_ROW,250, NULL, (void*) fileList, (char*) &FileSelProc, NULL, ListBox, "" },
+{   0, R2R|TT|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by name") },
+{   0, R2R|TT|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by type") },
+{ 300,    L2L|TB,      250, NULL, (void*) folderList, (char*) &DirSelProc, NULL, ListBox, "" },
+{ 300, R2R|TB|SAME_ROW,250, NULL, (void*) fileList, (char*) &FileSelProc, NULL, ListBox, "" },
 {   0,       0,        350, NULL, (void*) &fileName, NULL, NULL, TextBox, N_("Filename:") },
 {   0, COMBO_CALLBACK, 150, NULL, (void*) &SetTypeFilter, NULL, FileTypes, ComboBox, N_("File type:") },
 {   0,    SAME_ROW,      0, NULL, (void*) &BrowseOK, "", NULL, EndMark , "" }
diff --git a/xoptions.c b/xoptions.c
index 7d0c864..68d23bc 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -895,7 +895,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
 		forelast = lastrow;
 	    } else chain = 0, shrink = FALSE;
 	    j = SetPositionAndSize(args, last, lastrow, 3 /* border */,
-				   option[i].max /* w */, shrink ? textHeight : 0 /* h */, chain /* chain */);
+				   option[i].max /* w */, shrink ? textHeight : 0 /* h */, option[i].min & 0xE | chain /* chain */);
 	    XtSetArg(args[j], XtNlabel, _(option[i].name));  j++;
 	    if(option[i].textValue) { // special for buttons of New Variant dialog
 		XtSetArg(args[j], XtNsensitive, appData.noChessProgram || option[i].value < 0