Gui Bug Fixes

Fixed a few problems with the tabs and missing frame set. Added default sizing for windows and progress bars.

engine/source/gui/containers/guiFrameCtrl.cc

@@ -0,0 +1,1069 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2013 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+#include "console/consoleTypes.h"
+#include "graphics/dgl.h"
+#include "gui/guiCanvas.h"
+#include "gui/containers/guiFrameCtrl.h"
+
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_CONOBJECT(GuiFrameSetCtrl);
+
+//-----------------------------------------------------------------------------
+
+static EnumTable::Enums borderStateEnums[] =
+{
+   { GuiFrameSetCtrl::FRAME_STATE_ON,    "alwaysOn"  },
+   { GuiFrameSetCtrl::FRAME_STATE_OFF,   "alwaysOff" },
+   { GuiFrameSetCtrl::FRAME_STATE_AUTO,  "dynamic"   }
+};
+static EnumTable gBorderStateTable(3, &borderStateEnums[0]);
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::initPersistFields()
+{
+   Parent::initPersistFields();
+   addField("columns",        TypeS32Vector, Offset(mColumnOffsets, GuiFrameSetCtrl));
+   addField("rows",           TypeS32Vector, Offset(mRowOffsets, GuiFrameSetCtrl));
+   addField("borderWidth",    TypeS32,       Offset(mFramesetDetails.mBorderWidth, GuiFrameSetCtrl));
+   addField("borderColor",    TypeColorI,    Offset(mFramesetDetails.mBorderColor, GuiFrameSetCtrl));
+   addField("borderEnable",   TypeEnum,      Offset(mFramesetDetails.mBorderEnable, GuiFrameSetCtrl),   1, &gBorderStateTable);
+   addField("borderMovable",  TypeEnum,      Offset(mFramesetDetails.mBorderMovable, GuiFrameSetCtrl),  1, &gBorderStateTable);
+   addField("autoBalance",    TypeBool,      Offset(mAutoBalance, GuiFrameSetCtrl));
+   addField("fudgeFactor",    TypeS32,       Offset(mFudgeFactor, GuiFrameSetCtrl));
+}
+
+//-----------------------------------------------------------------------------
+ConsoleMethod( GuiFrameSetCtrl, frameBorder, void, 3, 4, "( index [ , enable = true ] ) Use the frameBorder method to change the frame's enable state.\n"
+																"This function is not working as of this writing\n"
+																"@param index Frame index to enable/disable/enable - Currently a boolean, but should actually be a string: alwaysOn, alwaysOff, dynamic.\n"
+																"@return No return value.")
+{
+   S32 index = dAtoi(argv[2]);
+   if (argc == 3)
+      object->frameBorderEnable(index);
+   else
+      object->frameBorderEnable(index, argv[3]);
+}
+
+ConsoleMethod( GuiFrameSetCtrl, frameMovable, void, 3, 4, "( index [ , enable = true ] ) Use the frameMovable method to change the frame's draggable state.\n"
+																"This function is not working as of this writing\n"
+																"@param index Frame index to enable/disable/enable - Currently a boolean, but should actually be a string: alwaysOn, alwaysOff, dynamic.\n"
+																"@return No return value.")
+{
+   S32 index = dAtoi(argv[2]);
+   if (argc == 3)
+      object->frameBorderMovable(index);
+   else
+      object->frameBorderMovable(index, argv[3]);
+}
+
+ConsoleMethod( GuiFrameSetCtrl, frameMinExtent, void, 5, 5, "(index, w, h ) Use the frameMinExtent method to set the minimum extent allowed for a frame.\n"
+																"These minimum extents do not prevent a parent control from collapsing the frame control and its frames. These limits apply to dragging and resizing as is done with the frames' draggable borders\n"
+																"@param index The frame number.\n"
+																"@param w Minimum width in pixels.\n"
+																"@param h Minimum height in pixels.\n"
+																"@return No return value.")
+{
+   Point2I extent(getMax(0, dAtoi(argv[3])), getMax(0, dAtoi(argv[4])));
+   object->frameMinExtent(dAtoi(argv[2]), extent);
+}
+
+ConsoleMethod( GuiFrameSetCtrl, addColumn, void, 2, 2, "() Use the addColumn method to add another column to the control.\n"
+																"The current contents of the GUIFrameCtrl may shift to fill the new column. New columns are added on the right of the control.\n"
+																"@return No return value.\n"
+																"@sa addRow, removeColumn, removeRow")
+{
+   Vector<S32> * columns = object->columnOffsets();
+   columns->push_back(0);
+   object->balanceFrames();
+}
+
+ConsoleMethod( GuiFrameSetCtrl, addRow, void, 2, 2, "() Use the addRow method to add another row to the control.\n"
+																"The current contents of the GUIFrameCtrl may shift to fill the new row. New rows are added on the bottom of the control.\n"
+																"@return No return value.\n"
+																"@sa addColumn, removeColumn, removeRow")
+{
+   Vector<S32> * rows = object->rowOffsets();
+   rows->push_back(0);
+   object->balanceFrames();
+}
+
+ConsoleMethod( GuiFrameSetCtrl, removeColumn, void, 2, 2, "() Use the removeColumn method to remove a column from the right side of the control.\n"
+																"Columns are removed right to left.\n"
+																"@return No return value.\n"
+																"@sa addColumn, addRow, removeRow")
+{
+   Vector<S32> * columns = object->columnOffsets();
+
+   if(columns->size() > 0)
+   {
+      columns->setSize(columns->size() - 1);
+      object->balanceFrames();
+   }
+   else
+      Con::errorf(ConsoleLogEntry::General, "No columns exist to remove");
+}
+
+ConsoleMethod( GuiFrameSetCtrl, removeRow, void, 2, 2, "() Use the removeRow method to remove the bottom row from the control.\n"
+																"Rows are removed bottom to top.\n"
+																"@return No return value.\n"
+																"@sa addColumn, addRow, removeColumn")
+{
+   Vector<S32> * rows = object->rowOffsets();
+
+   if(rows->size() > 0)
+   {
+      rows->setSize(rows->size() - 1);
+      object->balanceFrames();
+   }
+   else
+      Con::errorf(ConsoleLogEntry::General, "No rows exist to remove");
+}
+
+ConsoleMethod( GuiFrameSetCtrl, getColumnCount, S32, 2, 2, "() Use the getColumnCount method to determine the number of columns in this control.\n"
+																"@return Returns an integer value equal to the number of columns in this frame.\n"
+																"@sa getRowCount")
+{
+   return(object->columnOffsets()->size());
+}
+
+ConsoleMethod( GuiFrameSetCtrl, getRowCount, S32, 2, 2, "() Use the getRowCount method to determine the number of rows in this control.\n"
+																"@return Returns an integer value equal to the number of rows in this frame.\n"
+																"@sa getColumnCount")
+{
+   return(object->rowOffsets()->size());
+}
+
+ConsoleMethod( GuiFrameSetCtrl, getColumnOffset, S32, 3, 3, "( column ) Use the getColumnOffset method to determine the current pixel location of the specified column.\n"
+																"Column 0 is the first column on the left side of frame 0. Column 1 is on the right side of frame 0 and the left side of frame 1, etc.\n"
+																"@param column An integer value specifying the column to examine.\n"
+																"@return Returns the pixel offset for the specified column.\n"
+																"@sa getRowOffset, setColumnOffset, setRowOffset")
+{
+   S32 index = dAtoi(argv[2]);
+   if(index < 0 || index > object->columnOffsets()->size())
+   {
+      Con::errorf(ConsoleLogEntry::General, "Column index out of range");
+      return(0);
+   }
+   return((*object->columnOffsets())[index]);
+}
+
+ConsoleMethod( GuiFrameSetCtrl, getRowOffset, S32, 3, 3, "( row ) Use the getRowOffset method to determine the current pixel location of the specified row.\n"
+																"Row 0 is the first row on the top of the first row of frames. Row 1 is below the first row of frames and above the second row of frames, etc. 1, etc.\n"
+																"@param row An integer value specifying the row to examine.\n"
+																"@return Returns the pixel offset for the specified row.\n"
+																"@sa getColumnOffset, setColumnOffset, setRowOffset")
+{
+   S32 index = dAtoi(argv[2]);
+   if(index < 0 || index > object->rowOffsets()->size())
+   {
+      Con::errorf(ConsoleLogEntry::General, "Row index out of range");
+      return(0);
+   }
+   return((*object->rowOffsets())[index]);
+}
+
+ConsoleMethod( GuiFrameSetCtrl, setColumnOffset, void, 4, 4, "( column , offset ) Use the setColumnOffset method to determine the current pixel location of the specified column.\n"
+																"Column 0 is the first column on the left side of frame 0. Column 1 is on the right side of frame 0 and the left side of frame 1, etc. The left-most and right-most columns cannot be moved.\n"
+																"@param column An integer value specifying the column to examine.\n"
+																"@param offset An integer value specifying the new column offset in pixels.\n"
+																"@return No return value.\n"
+																"@sa getColumnOffset, getRowOffset, setRowOffset")
+{
+   Vector<S32> & columns = *(object->columnOffsets());
+
+   S32 index = dAtoi(argv[2]);
+   if(index < 0 || index > columns.size())
+   {
+      Con::errorf(ConsoleLogEntry::General, "Column index out of range");
+      return;
+   }
+
+   //
+   S32 offset = dAtoi(argv[3]);
+
+   // check the offset
+   if(((index > 0) && (offset < columns[index-1])) ||
+      ((index < (columns.size() - 1)) && (offset > columns[index+1])))
+   {
+      Con::errorf(ConsoleLogEntry::General, "Invalid column offset");
+      return;
+   }
+
+   columns[index] = offset;
+   object->updateSizes();
+}
+
+ConsoleMethod( GuiFrameSetCtrl, setRowOffset, void, 4, 4, "( row , offset ) Use the setRowOffset method to set the current pixel location of the specified row.\n"
+																"Row 0 is the first row on the top of the first row of frames. Row 1 is below the first row of frames and above the second row of frames, etc. 1, etc. The bottom-most and top-most rows cannot be moved.\n"
+																"@param row An integer value specifying the row to modify.\n"
+																"@param offset An integer value specifying the new row offset in pixels.\n"
+																"@return No return value.\n"
+																"@sa getColumnOffset, getRowOffset, setColumnOffset")
+{
+   Vector<S32> & rows = *(object->rowOffsets());
+
+   S32 index = dAtoi(argv[2]);
+   if(index < 0 || index > rows.size())
+   {
+      Con::errorf(ConsoleLogEntry::General, "Row index out of range");
+      return;
+   }
+
+   //
+   S32 offset = dAtoi(argv[3]);
+
+   // check the offset
+   if(((index > 0) && (offset < rows[index-1])) ||
+      ((index < (rows.size() - 1)) && (offset > rows[index+1])))
+   {
+      Con::errorf(ConsoleLogEntry::General, "Invalid row offset");
+      return;
+   }
+
+   rows[index] = offset;
+   object->updateSizes();
+}
+
+//-----------------------------------------------------------------------------
+GuiFrameSetCtrl::GuiFrameSetCtrl()
+{
+   VECTOR_SET_ASSOCIATION(mColumnOffsets);
+   VECTOR_SET_ASSOCIATION(mRowOffsets);
+   VECTOR_SET_ASSOCIATION(mFrameDetails);
+
+   mAutoBalance = true;
+   mIsContainer = true;
+
+   init(1, 1, NULL, NULL);
+}
+
+//-----------------------------------------------------------------------------
+GuiFrameSetCtrl::GuiFrameSetCtrl(U32 columns, U32 rows, const U32 columnOffsets[], const U32 rowOffsets[])
+{
+   init(columns, rows, columnOffsets, rowOffsets);
+}
+
+//-----------------------------------------------------------------------------
+GuiFrameSetCtrl::~GuiFrameSetCtrl()
+{
+   while (mFrameDetails.size() > 0)
+   {
+      delete mFrameDetails.last();
+      mFrameDetails.pop_back();
+   }
+}
+
+//-----------------------------------------------------------------------------
+
+void GuiFrameSetCtrl::addObject(SimObject *object)
+{
+   AssertFatal(object != NULL, "GuiFrameSetCtrl::addObject: NULL object");
+
+   // assign the object to a frame - give it default frame details
+   Parent::addObject(object);
+   GuiControl *gc = dynamic_cast<GuiControl *>(object);
+   if (gc != NULL)
+   {
+      FrameDetail *detail = new FrameDetail;
+      detail->mMinExtent = gc->mMinExtent;
+      mFrameDetails.push_back(detail);
+   }
+   else
+      mFrameDetails.push_back(NULL);
+   // resize it to fit into the frame to which it is assigned (if no frame for it, don't bother resizing)
+   if(isAwake())
+      computeSizes();
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::removeObject(SimObject *object)
+{
+   if (object != NULL)
+   {
+      VectorPtr<SimObject *>::iterator soitr;
+      VectorPtr<FrameDetail *>::iterator fditr = mFrameDetails.begin();
+      for (soitr = begin(); soitr != end(); soitr++, fditr++)
+      {
+         if (*soitr == object)
+         {
+            delete *fditr;
+            mFrameDetails.erase(fditr);
+            break;
+         }
+      }
+   }
+   Parent::removeObject(object);
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::resize(const Point2I &newPos, const Point2I &newExtent)
+{
+   // rebalance before losing the old extent (if required)
+   if (mAutoBalance == true)
+      rebalance(newExtent);
+
+   Parent::resize(newPos, newExtent);
+
+   // compute new sizing info for the frames - takes care of resizing the children
+   computeSizes( !mAutoBalance );
+}
+
+//-----------------------------------------------------------------------------
+
+void GuiFrameSetCtrl::getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent)
+{
+   Region curRegion = NONE;
+         //*** Determine the region by mouse position.
+         Point2I curMousePos = globalToLocalCoord(lastGuiEvent.mousePoint);
+         curRegion = pointInAnyRegion(curMousePos);
+
+   switch (curRegion)
+   {
+   case VERTICAL_DIVIDER:
+      // change to left-right cursor
+      if(GuiControl::smCursorChanged != CursorManager::curResizeVert)
+      {
+         //*** We've already changed the cursor, so set it back before we change it again.
+         if(GuiControl::smCursorChanged != -1)
+            Input::popCursor();
+
+         //*** Now change the cursor shape
+         Input::pushCursor(CursorManager::curResizeVert);
+         GuiControl::smCursorChanged = CursorManager::curResizeVert;
+
+      }
+      break;
+
+   case HORIZONTAL_DIVIDER:
+      // change to up-down cursor
+      if(GuiControl::smCursorChanged != CursorManager::curResizeHorz)
+      {
+         //*** We've already changed the cursor, so set it back before we change it again.
+         if(GuiControl::smCursorChanged != -1)
+            Input::popCursor();
+
+         //*** Now change the cursor shape
+         Input::pushCursor(CursorManager::curResizeHorz);
+         GuiControl::smCursorChanged = CursorManager::curResizeHorz;
+      }
+      break;
+
+   case DIVIDER_INTERSECTION:
+      // change to move cursor
+      if(GuiControl::smCursorChanged != CursorManager::curResizeAll)
+      {
+         //*** We've already changed the cursor, so set it back before we change it again.
+         if(GuiControl::smCursorChanged != -1)
+            Input::popCursor();
+
+         //*** Now change the cursor shape
+         Input::pushCursor(CursorManager::curResizeAll);
+         GuiControl::smCursorChanged = CursorManager::curResizeAll;
+
+      }
+      break;
+
+   case NONE:
+   default:
+      if(GuiControl::smCursorChanged != -1)
+      {
+         //*** We've already changed the cursor, so set it back before we change it again.
+         Input::popCursor();
+
+         GuiControl::smCursorChanged = -1;
+      }
+      break;
+   }
+
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::onMouseDown(const GuiEvent &event)
+{
+   if (mFramesetDetails.mBorderEnable != FRAME_STATE_OFF && mFramesetDetails.mBorderMovable != FRAME_STATE_OFF)
+   {
+      // determine if a divider was hit
+      Point2I curMousePos = globalToLocalCoord(event.mousePoint);
+      findHitRegion(curMousePos);                        // sets mCurVerticalHit, mCurHorizontalHit, & mCurHitRegion
+
+      if (mCurHitRegion != NONE)
+      {
+         mouseLock();
+         setFirstResponder();
+         setUpdate();
+      }
+   }
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::onMouseUp(const GuiEvent &event)
+{
+   if (mCurHitRegion != NONE)
+   {
+      mCurHitRegion = NONE;
+      mCurVerticalHit = NO_HIT;
+      mCurHorizontalHit = NO_HIT;
+      mouseUnlock();
+      setUpdate();
+   }
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::onMouseDragged(const GuiEvent &event)
+{
+   if (mCurHitRegion != NONE)
+   {
+      // identify the frames involved in the resizing, checking if they are resizable
+      S32 indexes[4];
+      S32 activeFrames = findResizableFrames(indexes);
+      if (activeFrames > 0)
+      {
+         S32 range[4];
+         // determine the range of movement, limiting as specified by individual frames
+         computeMovableRange(mCurHitRegion, mCurVerticalHit, mCurHorizontalHit, activeFrames, indexes, range);
+         Point2I curMousePos = globalToLocalCoord(event.mousePoint);
+         switch (mCurHitRegion)
+         {
+            case VERTICAL_DIVIDER:
+               mColumnOffsets[mCurVerticalHit] = getMin(getMax(range[0], curMousePos.x - mLocOnDivider.x), range[1]);
+               break;
+            case HORIZONTAL_DIVIDER:
+               mRowOffsets[mCurHorizontalHit] = getMin(getMax(range[0], curMousePos.y - mLocOnDivider.y), range[1]);
+               break;
+            case DIVIDER_INTERSECTION:
+               mColumnOffsets[mCurVerticalHit] = getMin(getMax(range[0], curMousePos.x - mLocOnDivider.x), range[1]);
+               mRowOffsets[mCurHorizontalHit] = getMin(getMax(range[2], curMousePos.y - mLocOnDivider.y), range[3]);
+               break;
+            default:
+               return;
+         }
+         computeSizes();
+      }
+   }
+}
+
+//-----------------------------------------------------------------------------
+bool GuiFrameSetCtrl::onAdd()
+{
+   if (Parent::onAdd() == false)
+      return(false);
+
+   return(true);
+}
+
+bool GuiFrameSetCtrl::onWake()
+{
+   if (Parent::onWake() == false)
+      return(false);
+
+   computeSizes();
+   return(true);
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::onRender(Point2I offset, const RectI &updateRect )
+{
+   RectI r(offset.x, offset.y, mBounds.extent.x, mBounds.extent.y);
+
+   // draw the border of the frameset if specified
+   //if (mProfile->mOpaque)
+   //   dglDrawRectFill(r, mProfile->mFillColor);
+
+   drawDividers(offset);
+
+   //if (mProfile->mBorder)
+   //   dglDrawRect(r, mProfile->mBorderColor);
+
+   // draw the frame contents
+   renderChildControls(offset, mBounds, updateRect);
+}
+
+//-----------------------------------------------------------------------------
+bool GuiFrameSetCtrl::init(U32 columns, U32 rows, const U32 columnOffsets[], const U32 rowOffsets[])
+{
+   if (columns != 0 && rows != 0)
+   {
+      mColumnOffsets.clear();
+      mRowOffsets.clear();
+      U32 i;
+      for (i = 0; i < columns; i++)
+      {
+         if (columnOffsets == NULL)
+            mColumnOffsets.push_back(0);
+         else
+         {
+            AssertFatal(columnOffsets != NULL, "GuiFrameSetCtrl::init: NULL column offsets");
+            mColumnOffsets.push_back((U32)columnOffsets[i]);
+            if (i > 0)
+            {
+               AssertFatal(mColumnOffsets[i - 1] < mColumnOffsets[i], "GuiFrameSetCtrl::init: column offsets must be monotonically increasing");
+               mColumnOffsets.clear();
+               return(false);
+            }
+         }
+      }
+      for (i = 0; i < rows; i++)
+      {
+         if (rowOffsets == NULL)
+            mRowOffsets.push_back(0);
+         else
+         {
+            AssertFatal(rowOffsets != NULL, "GuiFrameSetCtrl::init: NULL row offsets");
+            mRowOffsets.push_back((U32)rowOffsets[i]);
+            if (i > 0)
+            {
+               AssertFatal(mRowOffsets[i - 1] < mRowOffsets[i], "GuiFrameSetCtrl::init: row offsets must be monotonically increasing");
+               mRowOffsets.clear();
+               return(false);
+            }
+         }
+      }
+   }
+   mFramesetDetails.mBorderWidth = DEFAULT_BORDER_WIDTH;
+   mFramesetDetails.mBorderEnable = FRAME_STATE_AUTO;
+   mFramesetDetails.mBorderMovable = FRAME_STATE_AUTO;
+   mAutoBalance = false;
+   mFudgeFactor = 0;
+   mCurHitRegion = NONE;
+   mCurVerticalHit = NO_HIT;
+   mCurHorizontalHit = NO_HIT;
+   return(true);
+}
+
+//-----------------------------------------------------------------------------
+// point is assumed to already be in local coordinates.
+GuiFrameSetCtrl::Region GuiFrameSetCtrl::findHitRegion(const Point2I &point)
+{
+   Vector<S32>::iterator itr;
+   S32 i = 1;
+   // step through vertical dividers
+   for (itr = mColumnOffsets.begin() + 1; itr < mColumnOffsets.end(); itr++, i++)
+   {
+      if (hitVerticalDivider(*itr, point) == true)
+      {
+         mCurVerticalHit = i;
+         mLocOnDivider.x = point.x - (*itr);
+         break;
+      }
+   }
+   i = 1;
+   // step through horizontal dividers
+   for (itr = mRowOffsets.begin() + 1; itr < mRowOffsets.end(); itr++, i++)
+   {
+      if (hitHorizontalDivider(*itr, point) == true)
+      {
+         mCurHorizontalHit = i;
+         mLocOnDivider.y = point.y - (*itr);
+         break;
+      }
+   }
+   // now set type of hit...
+   if (mCurVerticalHit != NO_HIT)
+   {
+      if (mCurHorizontalHit != NO_HIT)
+         return(mCurHitRegion = DIVIDER_INTERSECTION);
+      else
+         return(mCurHitRegion = VERTICAL_DIVIDER);
+   }
+   else if (mCurHorizontalHit != NO_HIT)
+      return(mCurHitRegion = HORIZONTAL_DIVIDER);
+   else
+      return(mCurHitRegion = NONE);
+}
+
+GuiFrameSetCtrl::Region GuiFrameSetCtrl::pointInAnyRegion(const Point2I &point)
+{
+   Vector<S32>::iterator itr;
+   S32 i = 1;
+   S32 curVertHit = NO_HIT, curHorzHit = NO_HIT;
+   Region result = NONE;
+   // step through vertical dividers
+   for (itr = mColumnOffsets.begin() + 1; itr < mColumnOffsets.end(); itr++, i++)
+   {
+      if (hitVerticalDivider(*itr, point) == true)
+      {
+         curVertHit = i;
+         break;
+      }
+   }
+   i = 1;
+   // step through horizontal dividers
+   for (itr = mRowOffsets.begin() + 1; itr < mRowOffsets.end(); itr++, i++)
+   {
+      if (hitHorizontalDivider(*itr, point) == true)
+      {
+         curHorzHit = i;
+         break;
+      }
+   }
+   // now select the type of region in which the point lies
+   if (curVertHit != NO_HIT)
+   {
+      if (curHorzHit != NO_HIT)
+         result = DIVIDER_INTERSECTION;
+      else
+         result = VERTICAL_DIVIDER;
+   }
+   else if (curHorzHit != NO_HIT)
+      result = HORIZONTAL_DIVIDER;
+   return(result);
+}
+
+//-----------------------------------------------------------------------------
+// indexes must have at least 4 entries.
+// This *may* modify mCurVerticalHit, mCurHorizontalHit, and mCurHitRegion if it
+// determines that movement is disabled by frame content.
+// If it does make such a change, it also needs to do the reset performed by
+// onMouseUp if it sets mCurHitRegion to NONE.
+S32 GuiFrameSetCtrl::findResizableFrames(S32 indexes[])
+{
+   AssertFatal(indexes != NULL, "GuiFrameSetCtrl::findResizableFrames: NULL indexes");
+
+   // first, find the column and row indexes of the affected columns/rows
+   S32 validIndexes = 0;
+   switch (mCurHitRegion)
+   {
+      case VERTICAL_DIVIDER:                             // columns
+         indexes[0] = mCurVerticalHit - 1;
+         indexes[1] = mCurVerticalHit;
+         validIndexes = 2;
+         break;
+      case HORIZONTAL_DIVIDER:                           // rows
+         indexes[0] = mCurHorizontalHit - 1;
+         indexes[1] = mCurHorizontalHit;
+         validIndexes = 2;
+         break;
+      case DIVIDER_INTERSECTION:                         // columns & rows
+         indexes[0] = mCurVerticalHit - 1;               // columns
+         indexes[1] = mCurVerticalHit;
+         indexes[2] = mCurHorizontalHit - 1;             // rows
+         indexes[3] = mCurHorizontalHit;
+         validIndexes = 4;
+         break;
+      default:
+         break;
+   }
+   // now, make sure these indexes are for movable frames
+   VectorPtr<SimObject *>::iterator soitr;
+   VectorPtr<FrameDetail *>::iterator fditr = mFrameDetails.begin();
+   GuiControl *gc;
+   S32 column = 0;
+   S32 row = 0;
+   S32 columns = mColumnOffsets.size();
+   S32 rows = mRowOffsets.size();
+   for (soitr = begin(); soitr != end() && validIndexes > 0; soitr++, fditr++)
+   {
+      // don't continue if some of the frames are empty
+      if (fditr == mFrameDetails.end())
+         break;
+      // otherwise, check the gui elements for move-restrictions
+      gc = dynamic_cast<GuiControl *>(*soitr);
+      if (gc != NULL)
+      {
+         if (column == columns)
+         {
+            column = 0;
+            row++;
+         }
+         if (row == rows)
+            break;
+         switch (mCurHitRegion)
+         {
+            case VERTICAL_DIVIDER:
+               if ((column == indexes[0] || column == indexes[1]) && (*fditr) && (*fditr)->mBorderMovable == FRAME_STATE_OFF)
+                  validIndexes = 0;
+               break;
+            case HORIZONTAL_DIVIDER:
+               if ((row == indexes[0] || row == indexes[1]) && (*fditr) && (*fditr)->mBorderMovable == FRAME_STATE_OFF)
+                  validIndexes = 0;
+               break;
+            case DIVIDER_INTERSECTION:
+               if ((column == indexes[0] || column == indexes[1]) && (*fditr) && (*fditr)->mBorderMovable == FRAME_STATE_OFF)
+               {
+                  if ((row == indexes[2] || row == indexes[3]) && (*fditr) && (*fditr)->mBorderMovable == FRAME_STATE_OFF)
+                     validIndexes = 0;
+                  else
+                  {
+                     mCurHitRegion = HORIZONTAL_DIVIDER;
+                     mCurVerticalHit = NO_HIT;
+                     indexes[0] = indexes[2];
+                     indexes[1] = indexes[3];
+                     validIndexes = 2;
+                  }
+               }
+               else if ((row == indexes[2] || row == indexes[3]) && (*fditr) && (*fditr)->mBorderMovable == FRAME_STATE_OFF)
+               {
+                  mCurHitRegion = VERTICAL_DIVIDER;
+                  mCurHorizontalHit = NO_HIT;
+                  validIndexes = 2;
+               }
+               break;
+            default:
+               return(0);
+         }
+         column++;
+      }
+   }
+   if (validIndexes == 0)
+   {
+      mCurHitRegion = NONE;
+      mCurVerticalHit = NO_HIT;
+      mCurHorizontalHit = NO_HIT;
+      mouseUnlock();
+      setUpdate();
+   }
+   return(validIndexes);
+}
+
+//-----------------------------------------------------------------------------
+// This method locates the gui control and frame detail associated with a
+// particular frame index.
+bool GuiFrameSetCtrl::findFrameContents(S32 index, GuiControl **gc, FrameDetail **fd)
+{
+   AssertFatal(gc != NULL, "GuiFrameSetCtrl::findFrameContents: NULL gui control pointer");
+   AssertFatal(fd != NULL, "GuiFrameSetCtrl::findFrameContents: NULL frame detail pointer");
+   AssertFatal(*gc == NULL, "GuiFrameSetCtrl::findFrameContents: contents of gui control must be NULL");
+   AssertFatal(*fd == NULL, "GuiFrameSetCtrl::findFrameContents: contents of frame detail must be NULL");
+
+   if (index >= 0 && index < size())
+   {
+      VectorPtr<SimObject *>::iterator soitr;
+      VectorPtr<FrameDetail *>::iterator fditr = mFrameDetails.begin();
+      for (soitr = begin(); soitr != end(); soitr++, fditr++, index--)
+      {
+         if (index == 0)
+         {
+            GuiControl *guiCtrl = dynamic_cast<GuiControl *>(*soitr);
+            if (guiCtrl != NULL)
+            {
+               *gc = guiCtrl;
+               *fd = *fditr;
+               return(true);
+            }
+            else
+               break;
+         }
+      }
+   }
+   return(false);
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::computeSizes(bool balanceFrames)
+{
+   S32 columns = mColumnOffsets.size();
+   S32 rows = mRowOffsets.size();
+   S32 vDividers = columns - 1;
+   S32 hDividers = rows - 1;
+
+   if ( !balanceFrames && mFrameDetails.size() == ( columns * rows ) )
+   {
+      // This will do some goofy things if you allow this control to resize smaller than
+      // the additive minimum extents of its frames--so don't.
+      S32 index, delta;
+
+      if ( columns > 1 )
+      {
+         index = columns - 1;
+         delta = mFrameDetails[index]->mMinExtent.x - ( mBounds.extent.x - mColumnOffsets[index] );
+         while ( delta > 0 )
+         {
+            mColumnOffsets[index--] -= delta;
+            if ( index >= 0 )
+               delta = mFrameDetails[index]->mMinExtent.x - ( mColumnOffsets[index + 1] - mColumnOffsets[index] );
+            else
+               break;
+         }
+      }
+
+      if ( rows > 1 )
+      {
+         index = rows - 1;
+         delta = mFrameDetails[columns * index]->mMinExtent.y - ( mBounds.extent.y - mRowOffsets[index] );
+         while ( delta > 0 )
+         {
+            mRowOffsets[index--] -= delta;
+            if ( index >= 0 )
+               delta = mFrameDetails[columns * index]->mMinExtent.y - ( mRowOffsets[index + 1] - mRowOffsets[index] );
+            else
+               break;
+         }
+      }
+   }
+
+   // first, update the divider placement if necessary
+   if (balanceFrames == true && mColumnOffsets.size() > 0 && mRowOffsets.size() > 0)
+   {
+      Vector<S32>::iterator itr;
+      F32 totWidth = F32(mBounds.extent.x - vDividers * mFramesetDetails.mBorderWidth);
+      F32 totHeight = F32(mBounds.extent.y - hDividers * mFramesetDetails.mBorderWidth);
+      F32 frameWidth = totWidth/(F32)columns;
+      F32 frameHeight = totHeight/(F32)rows;
+      F32 i = 0.;
+      for (itr = mColumnOffsets.begin(); itr != mColumnOffsets.end(); itr++, i++)
+         *itr = (S32)(i * (frameWidth + (F32)mFramesetDetails.mBorderWidth));
+      i = 0.;
+      for (itr = mRowOffsets.begin(); itr != mRowOffsets.end(); itr++, i++)
+         *itr = (S32)(i * (frameHeight + (F32)mFramesetDetails.mBorderWidth));
+   }
+
+   // now, resize the contents of each frame (and move content w/o a frame beyond visible range)
+   VectorPtr<SimObject *>::iterator soitr;
+   GuiControl *gc;
+   S32 column = 0;
+   S32 row = 0;
+   Point2I newPos;
+   Point2I newExtent;
+   // step through all the children
+   for (soitr = begin(); soitr != end(); soitr++)
+   {
+      // column and row track the current frame being resized
+      if (column == columns)
+      {
+         column = 0;
+         row++;
+      }
+      // resize the contents if its a gui control...
+      gc = dynamic_cast<GuiControl *>(*soitr);
+      if (gc != NULL)
+      {
+         if (row >= rows)
+         {
+            // no more visible frames
+            newPos = mBounds.extent;
+            newExtent.set(DEFAULT_MIN_FRAME_EXTENT, DEFAULT_MIN_FRAME_EXTENT);
+            gc->resize(newPos, newExtent);
+            continue;
+         }
+         else
+         {
+            // determine x components of new position & extent
+            newPos.x = mColumnOffsets[column];
+            if (column == vDividers)
+               newExtent.x = mBounds.extent.x - mColumnOffsets[column];             // last column
+            else
+               newExtent.x = mColumnOffsets[column + 1] - mColumnOffsets[column] - mFramesetDetails.mBorderWidth;   // any other column
+            // determine y components of new position & extent
+            newPos.y = mRowOffsets[row];
+            if (row == hDividers)
+               newExtent.y = mBounds.extent.y - mRowOffsets[row];                   // last row
+            else
+               newExtent.y = mRowOffsets[row + 1] - mRowOffsets[row] - mFramesetDetails.mBorderWidth;            // any other row
+            // apply the new position & extent
+            gc->resize(newPos, newExtent);
+            column++;
+         }
+      }
+   }
+}
+
+//-----------------------------------------------------------------------------
+// this method looks at the previous offsets, and uses them to redistribute
+// the available height & width proportionally.
+void GuiFrameSetCtrl::rebalance(const Point2I &newExtent)
+{
+   // look at old_width and old_height - current extent
+   F32 widthScale = (F32)newExtent.x/(F32)mBounds.extent.x;
+   F32 heightScale = (F32)newExtent.y/(F32)mBounds.extent.y;
+   Vector<S32>::iterator itr;
+   // look at old width offsets
+   for (itr = mColumnOffsets.begin() + 1; itr < mColumnOffsets.end(); itr++)
+      // multiply each by new_width/old_width
+      *itr = S32(F32(*itr) * widthScale);
+   // look at old height offsets
+   for (itr = mRowOffsets.begin() + 1; itr < mRowOffsets.end(); itr++)
+      // multiply each by new_height/new_width
+      *itr = S32(F32(*itr) * heightScale);
+
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::computeMovableRange(Region hitRegion, S32 vertHit, S32 horzHit, S32 numIndexes, const S32 indexes[], S32 ranges[])
+{
+   S32 hardRanges[4];
+   switch (numIndexes)
+   {
+      case 2:
+         switch (hitRegion)
+         {
+            case VERTICAL_DIVIDER:
+               ranges[0] = hardRanges[0] = (vertHit <= 1) ? mFramesetDetails.mBorderWidth : mColumnOffsets[vertHit - 1] + mFramesetDetails.mBorderWidth;
+               ranges[1] = hardRanges[1] = (vertHit >= (mColumnOffsets.size() - 1)) ? mBounds.extent.x : mColumnOffsets[vertHit + 1] - mFramesetDetails.mBorderWidth;
+               break;
+            case HORIZONTAL_DIVIDER:
+               ranges[0] = hardRanges[0] = (horzHit <= 1) ? mFramesetDetails.mBorderWidth : mRowOffsets[horzHit - 1] + mFramesetDetails.mBorderWidth;
+               ranges[1] = hardRanges[1] = (horzHit >= (mRowOffsets.size() - 1)) ? mBounds.extent.y : mRowOffsets[horzHit + 1] - mFramesetDetails.mBorderWidth;
+               break;
+            default:
+               return;
+         }
+         break;
+      case 4:
+         if (hitRegion == DIVIDER_INTERSECTION)
+         {
+            ranges[0] = hardRanges[0] = (vertHit <= 1) ? mFramesetDetails.mBorderWidth : mColumnOffsets[vertHit - 1] + mFramesetDetails.mBorderWidth;
+            ranges[1] = hardRanges[1] = (vertHit >= (mColumnOffsets.size() - 1)) ? mBounds.extent.x : mColumnOffsets[vertHit + 1] - mFramesetDetails.mBorderWidth;
+            ranges[2] = hardRanges[2] = (horzHit <= 1) ? mFramesetDetails.mBorderWidth : mRowOffsets[horzHit - 1] + mFramesetDetails.mBorderWidth;
+            ranges[3] = hardRanges[3] = (horzHit >= (mRowOffsets.size() - 1)) ? mBounds.extent.y : mRowOffsets[horzHit + 1] - mFramesetDetails.mBorderWidth;
+         }
+         else
+            return;
+         break;
+      default:
+         return;
+   }
+   // now that we have the hard ranges, reduce ranges based on minimum frame extents
+   VectorPtr<SimObject *>::iterator soitr;
+   VectorPtr<FrameDetail *>::iterator fditr = mFrameDetails.begin();
+   GuiControl *gc;
+   S32 column = 0;
+   S32 row = 0;
+   S32 columns = mColumnOffsets.size();
+   S32 rows = mRowOffsets.size();
+   for (soitr = begin(); soitr != end(); soitr++, fditr++)
+   {
+      // only worry about visible frames
+      if (column == columns)
+      {
+         column = 0;
+         row++;
+      }
+      if (row == rows)
+         return;
+      gc = dynamic_cast<GuiControl *>(*soitr);
+      if (gc != NULL)
+      {
+         // the gui control is in a visible frame, so look at its frame details
+         if ((*fditr) != NULL)
+         {
+            switch (hitRegion)
+            {
+               case VERTICAL_DIVIDER:
+                  if (column == indexes[0])
+                     ranges[0] = getMax(ranges[0], hardRanges[0] + (*fditr)->mMinExtent.x);
+                  if (column == indexes[1])
+                     ranges[1] = getMin(ranges[1], hardRanges[1] - (*fditr)->mMinExtent.x);
+                  break;
+               case HORIZONTAL_DIVIDER:
+                  if (row == indexes[0])
+                     ranges[0] = getMax(ranges[0], hardRanges[0] + (*fditr)->mMinExtent.y);
+                  if (row == indexes[1])
+                     ranges[1] = getMin(ranges[1], hardRanges[1] - (*fditr)->mMinExtent.y);
+                  break;
+               case DIVIDER_INTERSECTION:
+                  if (column == indexes[0])
+                     ranges[0] = getMax(ranges[0], hardRanges[0] + (*fditr)->mMinExtent.x);
+                  if (column == indexes[1])
+                     ranges[1] = getMin(ranges[1], hardRanges[1] - (*fditr)->mMinExtent.x);
+                  if (row == indexes[2])
+                     ranges[2] = getMax(ranges[2], hardRanges[2] + (*fditr)->mMinExtent.y);
+                  if (row == indexes[3])
+                     ranges[3] = getMin(ranges[3], hardRanges[3] - (*fditr)->mMinExtent.y);
+                  break;
+               default:
+                  return;
+            }
+         }
+         column++;
+      }
+   }
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::drawDividers(const Point2I &offset)
+{
+   // draw the frame dividers, if they are enabled
+   if (mFramesetDetails.mBorderEnable != FRAME_STATE_OFF)
+   {
+      RectI r;
+      Vector<S32>::iterator itr;
+      for (itr = mColumnOffsets.begin() + 1; itr < mColumnOffsets.end(); itr++)
+      {
+         r.point = Point2I(*itr - mFramesetDetails.mBorderWidth, mFudgeFactor) + offset;
+         r.extent.set(mFramesetDetails.mBorderWidth, mBounds.extent.y - ( 2 * mFudgeFactor ) );
+         dglDrawRectFill(r, mFramesetDetails.mBorderColor);
+      }
+      for (itr = mRowOffsets.begin() + 1; itr < mRowOffsets.end(); itr++)
+      {
+         r.point = Point2I(mFudgeFactor, *itr - mFramesetDetails.mBorderWidth) + offset;
+         r.extent.set(mBounds.extent.x - ( 2 * mFudgeFactor ), mFramesetDetails.mBorderWidth);
+         dglDrawRectFill(r, mFramesetDetails.mBorderColor);
+      }
+   }
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::frameBorderEnable(S32 index, const char *state)
+{
+   GuiControl *gc = NULL;
+   FrameDetail *fd = NULL;
+   if (findFrameContents(index, &gc, &fd) == true && fd != NULL)
+   {
+      if (state != NULL)
+      {
+         // find the value for the detail member
+         for (S32 i = 0; i < gBorderStateTable.size; i++)
+         {
+            if (dStrcmp(state, gBorderStateTable.table[i].label) == 0)
+               fd->mBorderEnable = gBorderStateTable.table[i].index;
+         }
+      }
+      else
+         // defaults to AUTO if NULL passed in state
+         fd->mBorderEnable = FRAME_STATE_AUTO;
+   }
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::frameBorderMovable(S32 index, const char *state)
+{
+   GuiControl *gc = NULL;
+   FrameDetail *fd = NULL;
+   if (findFrameContents(index, &gc, &fd) == true && fd != NULL)
+   {
+      if (state != NULL)
+      {
+         // find the value for the detail member
+         for (S32 i = 0; i < gBorderStateTable.size; i++)
+         {
+            if (dStrcmp(state, gBorderStateTable.table[i].label) == 0)
+               fd->mBorderMovable = gBorderStateTable.table[i].index;
+         }
+      }
+      else
+         // defaults to AUTO if NULL passed in state
+         fd->mBorderMovable = FRAME_STATE_AUTO;
+   }
+}
+
+//-----------------------------------------------------------------------------
+void GuiFrameSetCtrl::frameMinExtent(S32 index, const Point2I &extent)
+{
+   GuiControl *gc = NULL;
+   FrameDetail *fd = NULL;
+   if (findFrameContents(index, &gc, &fd) == true && fd != NULL)
+      fd->mMinExtent = extent;
+}

engine/source/gui/containers/guiFrameCtrl.h

@@ -0,0 +1,189 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2013 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// A gui control allowing a window to be subdivided into panes,
+// each of which displays a gui control child of the
+// GuiFrameSetCtrl. Each gui control child will have an associated
+// FrameDetail through which frame-specific details can be
+// assigned. Frame-specific values override the values specified
+// for the entire frameset.
+//
+// Note that it is possible to have more children than frames,
+// or more frames than children. In the former case, the extra
+// children will not be visible (they are moved beyond the
+// visible extent of the frameset). In the latter case, frames
+// will be empty.
+//
+// If a frameset had two columns and two rows but only three
+// gui control children they would be assigned to frames as
+// follows:
+//                 1 | 2
+//                 -----
+//                 3 |
+//
+// The last frame would be blank.
+//-----------------------------------------------------------------------------
+
+#ifndef _GUIFRAMECTRL_H_
+#define _GUIFRAMECTRL_H_
+
+#define DISABLE_COPY_CTOR(className) \
+   className(const className &)
+
+#define DISABLE_ASSIGNMENT(className) \
+   className& operator=(const className &)
+
+#ifndef _GUICONTROL_H_
+#include "gui/guiControl.h"
+#endif
+
+// for debugging porpoises...
+#define GUI_FRAME_DEBUG
+// ...save the porpoises
+
+class GuiFrameSetCtrl : public GuiControl
+{
+private:
+   typedef GuiControl Parent;
+public:
+   enum
+   {
+      FRAME_STATE_ON,                                    // ON overrides OFF
+      FRAME_STATE_OFF,                                   // OFF overrides AUTO
+      FRAME_STATE_AUTO,                                  // AUTO == ON, unless overridden
+
+      NO_HIT = -1,
+
+      DEFAULT_BORDER_WIDTH = 4,
+      DEFAULT_COLUMNS = 1,
+      DEFAULT_ROWS = 1,
+      DEFAULT_MIN_FRAME_EXTENT = 64
+   };
+   enum Region
+   {
+      VERTICAL_DIVIDER,
+      HORIZONTAL_DIVIDER,
+      DIVIDER_INTERSECTION,
+      NONE
+   };
+   struct FrameDetail
+   {
+      U32 mBorderWidth;
+      ColorI mBorderColor;
+      S32 mBorderEnable;
+      S32 mBorderMovable;
+      Point2I mMinExtent;
+      FrameDetail()                                      { mBorderWidth = DEFAULT_BORDER_WIDTH; mBorderEnable = FRAME_STATE_AUTO; mBorderMovable = FRAME_STATE_AUTO; mMinExtent.set(DEFAULT_MIN_FRAME_EXTENT, DEFAULT_MIN_FRAME_EXTENT); }
+   };
+   DECLARE_CONOBJECT(GuiFrameSetCtrl);
+   static void initPersistFields();
+
+   GuiFrameSetCtrl();
+   GuiFrameSetCtrl(U32 columns, U32 rows, const U32 columnOffsets[] = NULL, const U32 rowOffsets[] = NULL);
+   virtual ~GuiFrameSetCtrl();
+
+   void addObject(SimObject *obj);
+   void removeObject(SimObject *obj);
+
+   virtual void resize(const Point2I &newPosition, const Point2I &newExtent);
+
+   virtual void onMouseDown(const GuiEvent &event);
+   virtual void onMouseUp(const GuiEvent &event);
+   virtual void onMouseDragged(const GuiEvent &event);
+
+   bool onAdd();
+   void onRender(Point2I offset, const RectI &updateRect );
+protected:
+   /* member variables */
+   Vector<S32> mColumnOffsets;
+   Vector<S32> mRowOffsets;
+   GuiCursor *mMoveCursor;
+   GuiCursor *mUpDownCursor;
+   GuiCursor *mLeftRightCursor;
+   GuiCursor *mDefaultCursor;
+   FrameDetail mFramesetDetails;
+   VectorPtr<FrameDetail *> mFrameDetails;
+   bool mAutoBalance;
+   S32   mFudgeFactor;
+
+   /* divider activation member variables */
+   Region mCurHitRegion;
+   Point2I mLocOnDivider;
+   S32 mCurVerticalHit;
+   S32 mCurHorizontalHit;
+
+   bool init(U32 columns, U32 rows, const U32 columnOffsets[], const U32 rowOffsets[]);
+
+   Region findHitRegion(const Point2I &point);
+   Region pointInAnyRegion(const Point2I &point);
+   S32 findResizableFrames(S32 indexes[]);
+   bool hitVerticalDivider(S32 x, const Point2I &point);
+   bool hitHorizontalDivider(S32 y, const Point2I &point);
+
+   virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
+   void rebalance(const Point2I &newExtent);
+
+   void computeSizes(bool balanceFrames = false);
+   void computeMovableRange(Region hitRegion, S32 vertHit, S32 horzHit, S32 numIndexes, const S32 indexes[], S32 ranges[]);
+
+   void drawDividers(const Point2I &offset);
+public:
+   U32 columns() const                                   { return(mColumnOffsets.size()); }
+   U32 rows() const                                      { return(mRowOffsets.size()); }
+   U32 borderWidth() const                               { return(mFramesetDetails.mBorderWidth); }
+   Vector<S32>* columnOffsets()                          { return(&mColumnOffsets); }
+   Vector<S32>* rowOffsets()                             { return(&mRowOffsets); }
+   FrameDetail* framesetDetails()                        { return(&mFramesetDetails); }
+
+   bool findFrameContents(S32 index, GuiControl **gc, FrameDetail **fd);
+
+   void frameBorderEnable(S32 index, const char *state = NULL);
+   void frameBorderMovable(S32 index, const char *state = NULL);
+   void frameMinExtent(S32 index, const Point2I &extent);
+
+   void balanceFrames()    { computeSizes(true); }
+   void updateSizes()      { computeSizes();     }
+
+   bool onWake();
+
+private:
+   DISABLE_COPY_CTOR(GuiFrameSetCtrl);
+   DISABLE_ASSIGNMENT(GuiFrameSetCtrl);
+};
+
+//-----------------------------------------------------------------------------
+// x is the first value inside the next column, so the divider x-coords
+// precede x.
+inline bool GuiFrameSetCtrl::hitVerticalDivider(S32 x, const Point2I &point)
+{
+   return((point.x >= S32(x - mFramesetDetails.mBorderWidth)) && (point.x < x) && (point.y >= 0) && (point.y < S32(mBounds.extent.y)));
+}
+
+//-----------------------------------------------------------------------------
+// y is the first value inside the next row, so the divider y-coords precede y.
+inline bool GuiFrameSetCtrl::hitHorizontalDivider(S32 y, const Point2I &point)
+{
+   return((point.x >= 0) && (point.x < S32(mBounds.extent.x)) && (point.y >= S32(y - mFramesetDetails.mBorderWidth)) && (point.y < y));
+}
+
+#endif // _GUI_FRAME_CTRL_H

engine/source/gui/containers/guiTabBookCtrl.cc

@@ -158,7 +158,7 @@ void GuiTabBookCtrl::onChildAdded( GuiControl *child )
    // Calculate Page Information
    calculatePageTabs();
 
-   child->resize( mPageRect.point, mPageRect.extent );
+   child->resize( Point2I(0, 0), mPageRect.extent );
 }
 
 
@@ -224,15 +224,13 @@ void GuiTabBookCtrl::resize(const Point2I &newPosition, const Point2I &newExtent
    for(i = begin(); i != end(); i++)
    {
       GuiControl *ctrl = static_cast<GuiControl *>(*i);
-      ctrl->resize( mPageRect.point, mPageRect.extent );
+      ctrl->resize( Point2I(0, 0), mPageRect.extent );
    }
 }
 
 void GuiTabBookCtrl::childResized(GuiControl *child)
 {
-   //Parent::childResized( child );
-
-   child->resize( mPageRect.point, mPageRect.extent );
+   child->resize( Point2I(0,0), mPageRect.extent );
 }
 
 Point2I GuiTabBookCtrl::getTabLocalCoord(const Point2I &src)
@@ -344,7 +342,7 @@ void GuiTabBookCtrl::onRender(Point2I offset, const RectI &updateRect)
 	if(mPageRect.isValidRect())
 	{
 		// Render Children
-		renderChildControls(offset, mBounds, updateRect);
+		renderChildControls(offset, RectI(offset + mPageRect.point, mPageRect.extent), updateRect);
 	}
 }
 

engine/source/gui/containers/guiWindowCtrl.cc

@@ -53,7 +53,7 @@ GuiWindowCtrl::GuiWindowCtrl(void)
    mMouseMovingWin = false;
    mMouseResizeWidth = false;
    mMouseResizeHeight = false;
-   mBounds.extent.set(100, 200);
+   mBounds.extent.set(300, 240);
    mMinimizeIndex = -1;
    mTabIndex = -1;
 

engine/source/gui/guiProgressCtrl.cc

@@ -33,6 +33,7 @@ IMPLEMENT_CONOBJECT(GuiProgressCtrl);
 
 GuiProgressCtrl::GuiProgressCtrl()
 {
+	mBounds.extent.set(230, 24);
    mCurrent = 0.0f;
    mStart = 0.0f;
    mEnd = 0.0f;