[Once-cvs] oncecode/src/client ocawsmgr.cpp,1.25,1.26 ocoverlay.cpp,1.35,1.36

[Bryan D. <duf...@us...>]

Update of /cvsroot/once/oncecode/src/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13891/src/client

Modified Files:
	ocawsmgr.cpp ocoverlay.cpp 
Log Message:
Altered navbar behavior - now requires clicking on the navbar. 
Modified Files:
 	client_data/awsclient.def src/client/ocawsmgr.cpp 
 	src/client/ocoverlay.cpp 


Index: ocoverlay.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/client/ocoverlay.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ocoverlay.cpp	20 Feb 2005 17:19:19 -0000	1.35
--- ocoverlay.cpp	23 Feb 2005 22:28:26 -0000	1.36
***************
*** 925,928 ****
--- 925,935 ----
  	/* I have tried to implement this feature in the CS cvs but it seems the
  	 * devs don't want to hurry on this one. */
+ 	if (strncmp(name, "none", 4) == 0)
+ 	{
+ 		window->Hide();
+ 		return;
+ 	} 
+ 	window->Show();
+ 
  	iAwsParmList* parmlist = awsmgr->GetAws()->CreateParmList();
  	parmlist->AddString("Tab", name);

Index: ocawsmgr.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/client/ocawsmgr.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ocawsmgr.cpp	17 Feb 2005 07:41:02 -0000	1.25
--- ocawsmgr.cpp	23 Feb 2005 22:28:25 -0000	1.26
***************
*** 163,167 ****
  
  	ocOverlayMain* ov = (ocOverlayMain*) GetOverlay(OVERLAY_MAIN);
! 	ov->ShowTab(page_names[type]);
  }
  
--- 163,174 ----
  
  	ocOverlayMain* ov = (ocOverlayMain*) GetOverlay(OVERLAY_MAIN);
! 	if (type == current_tab) {
! 		ov->ShowTab("none");
! 		current_tab = PAGE_NONE;
! 	} else
! 	{
! 		current_tab = type;
! 		ov->ShowTab(page_names[type]);
! 	}
  }
  
***************
*** 235,238 ****
--- 242,246 ----
  	SYSTRACE("ocAwsMgr::SetupFrame");
  	/* First, we check the mouse pos */
+ /*
  	enum page_type mouse_area;
   
***************
*** 241,245 ****
  	if (mouse_area != PAGE_NONE) 
  	{
! 		ShowMainWindowPage(mouse_area);
  	}
  	else
--- 249,253 ----
  	if (mouse_area != PAGE_NONE) 
  	{
! 		//ShowMainWindowPage(mouse_area);
  	}
  	else
***************
*** 261,265 ****
  		}
  	}
! 
  	aws->Redraw();
  	aws->Print(g3d, 192);
--- 269,273 ----
  		}
  	}
! */
  	aws->Redraw();
  	aws->Print(g3d, 192);