Changeset 9622 in orxonox.OLD

Timestamp:

Jul 30, 2006, 10:26:56 PM (18 years ago)

Author:

bensch

Message:

better segfault-less packing

Location:

branches/proxy/src/lib

Files:

• gui/gl/glgui_box.cc (modified) (3 diffs)
• gui/gl/glgui_box.h (modified) (1 diff)
• gui/gl/glgui_widget.h (modified) (1 diff)
• network/monitor/network_stats_widget.cc (modified) (4 diffs)

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

@@ -90 +90 @@
   }
 
-  void GLGuiBox::pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer)
+  void GLGuiBox::pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer)
   {
     assert (widget != NULL && widgetPointer != NULL);
@@ -100 +100 @@
       {
         this->_children.insert(it, widget);
+        this->packing(widget);
         return;
       }
@@ -105 +106 @@
     PRINTF(2)("WidgetPointer %p not found, inserting at the end\n", widgetPointer);
     this->pack(widget);
-    this->packing(widget);
   }
 

branches/proxy/src/lib/gui/gl/glgui_box.h

@@ -31 +31 @@
     virtual void pack(GLGuiWidget* widget);
     void pack(GLGuiWidget* widget, unsigned int position);
-    void pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer);
+    void pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer);
     void packFront(GLGuiWidget* widget);
     void packBack(GLGuiWidget* widget);

branches/proxy/src/lib/gui/gl/glgui_widget.h

@@ -207 +207 @@
 
     void setFont(const Font& font);
-    void setFont(const std::string& fontName, unsigned int renderSize);
+    void setFont(const std::string& fontName, unsigned int renderSize = FONT_DEFAULT_RENDER_SIZE);
 
     void setAnimatedStateChanges(bool animated);

branches/proxy/src/lib/network/monitor/network_stats_widget.cc

@@ -34 +34 @@
   this->setIP(ip);
 
+  this->_name.setFont("fonts/arial.ttf");
+  this->_ip.setFont("fonts/arial.ttf");
+
   this->pack(&this->_name);
   this->pack(&this->_ip);
@@ -63 +66 @@
 
 NodeWidget::NodeWidget(const NetworkNode* node)
-  : _proxyWidget("node", node->getPeerInfo()->ip)
+    : _proxyWidget("node", node->getPeerInfo()->ip)
 {
   this->_clientNameWidth = 100.0f;
@@ -209 +212 @@
 {
   this->_proxies.push_back(new NodeWidget(node));
-  this->pack(this->_proxies.back());
+  this->pack(this->_proxies.back(), &this->_refreshButton);
   this->_proxies.back()->show();
 }
@@ -226 +229 @@
   if (ls != NULL && !ls->empty())
     bo = ls->front();
-
-  printf("==== %p\n", bo);
 
   if (bo != NULL && NetworkStatsWidget::_statsWidget == NULL)