Changeset 9622 in orxonox.OLD
- Timestamp:
- Jul 30, 2006, 10:26:56 PM (18 years ago)
- Location:
- branches/proxy/src/lib
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/gui/gl/glgui_box.cc
r9621 r9622 90 90 } 91 91 92 void GLGuiBox::pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer)92 void GLGuiBox::pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer) 93 93 { 94 94 assert (widget != NULL && widgetPointer != NULL); … … 100 100 { 101 101 this->_children.insert(it, widget); 102 this->packing(widget); 102 103 return; 103 104 } … … 105 106 PRINTF(2)("WidgetPointer %p not found, inserting at the end\n", widgetPointer); 106 107 this->pack(widget); 107 this->packing(widget);108 108 } 109 109 -
branches/proxy/src/lib/gui/gl/glgui_box.h
r9621 r9622 31 31 virtual void pack(GLGuiWidget* widget); 32 32 void pack(GLGuiWidget* widget, unsigned int position); 33 void pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer);33 void pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer); 34 34 void packFront(GLGuiWidget* widget); 35 35 void packBack(GLGuiWidget* widget); -
branches/proxy/src/lib/gui/gl/glgui_widget.h
r9620 r9622 207 207 208 208 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); 210 210 211 211 void setAnimatedStateChanges(bool animated); -
branches/proxy/src/lib/network/monitor/network_stats_widget.cc
r9618 r9622 34 34 this->setIP(ip); 35 35 36 this->_name.setFont("fonts/arial.ttf"); 37 this->_ip.setFont("fonts/arial.ttf"); 38 36 39 this->pack(&this->_name); 37 40 this->pack(&this->_ip); … … 63 66 64 67 NodeWidget::NodeWidget(const NetworkNode* node) 65 : _proxyWidget("node", node->getPeerInfo()->ip)68 : _proxyWidget("node", node->getPeerInfo()->ip) 66 69 { 67 70 this->_clientNameWidth = 100.0f; … … 209 212 { 210 213 this->_proxies.push_back(new NodeWidget(node)); 211 this->pack(this->_proxies.back() );214 this->pack(this->_proxies.back(), &this->_refreshButton); 212 215 this->_proxies.back()->show(); 213 216 } … … 226 229 if (ls != NULL && !ls->empty()) 227 230 bo = ls->front(); 228 229 printf("==== %p\n", bo);230 231 231 232 if (bo != NULL && NetworkStatsWidget::_statsWidget == NULL)
Note: See TracChangeset
for help on using the changeset viewer.