Changeset 9108 in orxonox.OLD

Timestamp:

Jul 4, 2006, 11:10:19 AM (18 years ago)

Author:

rennerc

Message:

better network menu layout

Location:

branches/presentation/src

Files:

• lib/gui/gl/glgui_box.cc (modified) (1 diff)
• story_entities/menu/game_menu.cc (modified) (5 diffs)

branches/presentation/src/lib/gui/gl/glgui_box.cc

@@ -59 +59 @@
   void GLGuiBox::unpack(GLGuiWidget* widget)
   {
-    assert(widget == NULL);
+    assert(widget != NULL);
 
     std::vector<GLGuiWidget*>::iterator delWidget = std::find(this->children.begin(), this->children.end(), widget);

branches/presentation/src/story_entities/menu/game_menu.cc

@@ -236 +236 @@
   if (this->networkBox == NULL)
   {
-    this->networkBox = new OrxGui::GLGuiBox();
+    this->networkBox = new OrxGui::GLGuiBox( OrxGui::Horizontal );
     {
+      OrxGui::GLGuiBox * box = new OrxGui::GLGuiBox();
+      
       OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client");
-      networkBox->pack(clientButton);
+      box->pack(clientButton);
       clientButton->connect(SIGNAL(clientButton, released), this, SLOT(GameMenu, showClientMenu));
 
       OrxGui::GLGuiButton* serverButton = new OrxGui::GLGuiPushButton("Server");
-      networkBox->pack(serverButton);
+      box->pack(serverButton);
       serverButton->connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));
-
-
+      
+      networkBox->pack( box );
     }
   }
@@ -511 +513 @@
   if ( this->serverNetworkBox )
   {
-    delete this->serverNetworkBox;
-    this->serverNetworkBox = NULL;
+    this->networkBox->unpack( this->serverNetworkBox );
+    this->serverNetworkBox->hideAll();
+    //delete this->serverNetworkBox;
+    //this->serverNetworkBox = NULL;
   }
   
@@ -535 +539 @@
   }
   
+  this->networkBox->pack( this->clientNetworkBox );
+  
   this->clientNetworkBox->showAll();
   
-  this->clientNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
+  //this->clientNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
 
@@ -547 +553 @@
   if ( this->clientNetworkBox )
   {
-    delete this->clientNetworkBox;
-    this->clientNetworkBox = NULL;
+    this->networkBox->unpack( this->clientNetworkBox );
+    this->clientNetworkBox->hideAll();
+    //delete this->clientNetworkBox;
+    //this->clientNetworkBox = NULL;
   }
   
@@ -569 +577 @@
   }
   
+  this->networkBox->pack( this->serverNetworkBox );
+  
   this->serverNetworkBox->showAll();
   
-  this->serverNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
+  //this->serverNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }