From 0200ba1ed27e46f00e822387788bad871e938526 Mon Sep 17 00:00:00 2001
From: Ole Loots <ole@monochrom.net>
Date: Mon, 27 Aug 2012 23:32:54 +0200
Subject: Revert positioning Fix dated 2012-08-07

---
 atari/settings.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'atari')

diff --git a/atari/settings.c b/atari/settings.c
index 010680a80..787eee70d 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -123,8 +123,8 @@ WINDOW * open_settings()
 
 	if( dlgwin == NULL){
 		// TODO: localize title
-		dlgwin = FormCreate( dlgtree, WAT_FORM, NULL, (char*)"Settings",
-					  NULL, TRUE, 1);
+		dlgwin = FormCreate(dlgtree, WAT_FORM, NULL, (char*)"Settings",
+					  NULL, TRUE, FALSE);
 		if( !dlgwin ){
 			return( NULL );
 		}
@@ -172,10 +172,12 @@ WINDOW * open_settings()
 							clear_history, NULL);
 
 		EvntAdd( dlgwin, WM_CLOSED, onclose, EV_TOP  );
-		display_settings();
+		display_settings();
+		toggle_objects();
 
 	} else {
-		WindTop( dlgwin );
+		WindTop( dlgwin );
+		display_settings();
 		toggle_objects();
 	}
 	return( dlgwin );
@@ -185,7 +187,6 @@ void close_settings(void)
 {
 	if( dlgwin != NULL ){
 		/* Duplicated form tree must be free'd manualy? */
-		ObjcFree(ObjcTree(OC_FORM, dlgwin));
 		WindClose(dlgwin);
 		dlgwin = NULL;
 	}
@@ -320,13 +321,6 @@ static colour color_popup(int x, int y, colour current)
 	/* copy screen image */
 	vro_cpyfm (app.graf.handle, S_ONLY, pxy, &screen, &bg);
 
-	/*
-	plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3,
-	               y+(GRID_ROWS*boxheight)+3, &outline);
-
-	plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2,
-	          &outline);
-	*/
 	plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y,
 	          &outline);
 
@@ -466,11 +460,11 @@ form_event( WINDOW *win, int index, int external, void *unused2)
 	};
 	int num_locales = (sizeof(locales)/sizeof(char*));
 	short x, y;
-	int choice;
-
+	int choice;
+
 	switch( index ){
 
-		case CHOICES_CB_USE_PROXY:
+		case CHOICES_CB_USE_PROXY:
 			if( checked ){
 				ENABLE_OBJ( CHOICES_EDIT_PROXY_HOST );
 				ENABLE_OBJ( CHOICES_CB_PROXY_AUTH );
@@ -479,7 +473,8 @@ form_event( WINDOW *win, int index, int external, void *unused2)
 				DISABLE_OBJ( CHOICES_EDIT_PROXY_HOST );
 				DISABLE_OBJ( CHOICES_CB_PROXY_AUTH );
 			}
-			FORMEVENT( CHOICES_CB_PROXY_AUTH );
+			FORMEVENT( CHOICES_CB_PROXY_AUTH );
+			ObjcDrawParent(OC_FORM, dlgwin, index, 9, 1 );
 			break;
 
 		case CHOICES_CB_PROXY_AUTH:
@@ -880,7 +875,7 @@ static void apply_settings( void )
 	nsoption_set_charp(http_proxy_auth_pass,
 		ObjcString( dlgtree, CHOICES_EDIT_PROXY_PASSWORD, NULL));
 	nsoption_set_charp(http_proxy_auth_user,
-		ObjcString( dlgtree, CHOICES_EDIT_PROXY_USERNAME, NULL));
+		ObjcString( dlgtree, CHOICES_EDIT_PROXY_USERNAME, NULL));
 	nsoption_set_charp(http_proxy_host,
 		ObjcString( dlgtree, CHOICES_EDIT_PROXY_HOST, NULL));
 	nsoption_set_int(http_proxy_port,
-- 
cgit v1.2.3