Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9622 in orxonox.OLD


Ignore:
Timestamp:
Jul 30, 2006, 10:26:56 PM (18 years ago)
Author:
bensch
Message:

better segfault-less packing ;)

Location:
branches/proxy/src/lib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/gui/gl/glgui_box.cc

    r9621 r9622  
    9090  }
    9191
    92   void GLGuiBox::pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer)
     92  void GLGuiBox::pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer)
    9393  {
    9494    assert (widget != NULL && widgetPointer != NULL);
     
    100100      {
    101101        this->_children.insert(it, widget);
     102        this->packing(widget);
    102103        return;
    103104      }
     
    105106    PRINTF(2)("WidgetPointer %p not found, inserting at the end\n", widgetPointer);
    106107    this->pack(widget);
    107     this->packing(widget);
    108108  }
    109109
  • branches/proxy/src/lib/gui/gl/glgui_box.h

    r9621 r9622  
    3131    virtual void pack(GLGuiWidget* widget);
    3232    void pack(GLGuiWidget* widget, unsigned int position);
    33     void pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer);
     33    void pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer);
    3434    void packFront(GLGuiWidget* widget);
    3535    void packBack(GLGuiWidget* widget);
  • branches/proxy/src/lib/gui/gl/glgui_widget.h

    r9620 r9622  
    207207
    208208    void setFont(const Font& font);
    209     void setFont(const std::string& fontName, unsigned int renderSize);
     209    void setFont(const std::string& fontName, unsigned int renderSize = FONT_DEFAULT_RENDER_SIZE);
    210210
    211211    void setAnimatedStateChanges(bool animated);
  • branches/proxy/src/lib/network/monitor/network_stats_widget.cc

    r9618 r9622  
    3434  this->setIP(ip);
    3535
     36  this->_name.setFont("fonts/arial.ttf");
     37  this->_ip.setFont("fonts/arial.ttf");
     38
    3639  this->pack(&this->_name);
    3740  this->pack(&this->_ip);
     
    6366
    6467NodeWidget::NodeWidget(const NetworkNode* node)
    65   : _proxyWidget("node", node->getPeerInfo()->ip)
     68    : _proxyWidget("node", node->getPeerInfo()->ip)
    6669{
    6770  this->_clientNameWidth = 100.0f;
     
    209212{
    210213  this->_proxies.push_back(new NodeWidget(node));
    211   this->pack(this->_proxies.back());
     214  this->pack(this->_proxies.back(), &this->_refreshButton);
    212215  this->_proxies.back()->show();
    213216}
     
    226229  if (ls != NULL && !ls->empty())
    227230    bo = ls->front();
    228 
    229   printf("==== %p\n", bo);
    230231
    231232  if (bo != NULL && NetworkStatsWidget::_statsWidget == NULL)
Note: See TracChangeset for help on using the changeset viewer.