Revision: 8436
http://playerstage.svn.sourceforge.net/playerstage/?rev=8436&view=rev
Author: natepak
Date: 2009-11-23 16:10:13 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Set a minimum size to the gui
Modified Paths:
--------------
code/gazebo/trunk/server/gui/Gui.cc
code/gazebo/trunk/server/gui/Sidebar.cc
Modified: code/gazebo/trunk/server/gui/Gui.cc
===================================================================
--- code/gazebo/trunk/server/gui/Gui.cc 2009-11-22 20:49:26 UTC (rev 8435)
+++ code/gazebo/trunk/server/gui/Gui.cc 2009-11-23 16:10:13 UTC (rev 8436)
@@ -61,6 +61,12 @@
this->posP = new ParamT<Vector2<int> >("pos",Vector2<int>(0,0),0);
Param::End();
+ width = std::max(800, this->w());
+ height = std::max(480, this->h());
+
+ this->w(width);
+ this->h(height);
+
// The order of creation matters! Menubar first, followed by FrameManager,
// then statusbar
{
Modified: code/gazebo/trunk/server/gui/Sidebar.cc
===================================================================
--- code/gazebo/trunk/server/gui/Sidebar.cc 2009-11-22 20:49:26 UTC (rev
8435)
+++ code/gazebo/trunk/server/gui/Sidebar.cc 2009-11-23 16:10:13 UTC (rev
8436)
@@ -58,7 +58,12 @@
this->box(FL_NO_BOX);
this->color(BG_COLOR);
- this->entityBrowser = new Fl_Hold_Browser(x+10, y+20, w-20, 25*5,"Models");
+ fprintf(stderr,"Entity Height[%d]\n",(this->h()-20)*0.25);
+ fprintf(stderr,"Param Height[%d]\n",(this->h()-20)*0.5);
+
+ //this->entityBrowser = new Fl_Hold_Browser(x+10, y+20, w-20, 25*5,"Models");
+ this->entityBrowser = new Fl_Hold_Browser(x+10, y+20, w-20,
+ (this->h()-20)*0.25,"Models");
this->entityBrowser->align(FL_ALIGN_TOP);
this->entityBrowser->callback( &Sidebar::EntityBrowserCB, this );
this->entityBrowser->color(FL_WHITE);
@@ -68,7 +73,9 @@
this->paramColumnWidths[2] = 0;
y = this->entityBrowser->y() + this->entityBrowser->h() + 20;
- this->paramBrowser = new Fl_Hold_Browser(x+10, y, w-20,25*10,"Parameters");
+ //this->paramBrowser = new Fl_Hold_Browser(x+10, y, w-20,25*10,"Parameters");
+ this->paramBrowser = new Fl_Hold_Browser(x+10, y, w-20,
+ (this->h()-20)*0.5,"Parameters");
this->paramBrowser->align(FL_ALIGN_TOP);
this->paramBrowser->column_char('~');
this->paramBrowser->column_widths( this->paramColumnWidths );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
