[brlcad-commits] SF.net SVN: brlcad:[39505] brlcad/branches/dmtogl/src/libdm/dm-togl.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2010-06-02 19:28:32
|
Revision: 39505 http://brlcad.svn.sourceforge.net/brlcad/?rev=39505&view=rev Author: starseeker Date: 2010-06-02 19:28:26 +0000 (Wed, 02 Jun 2010) Log Message: ----------- I don't think this is quite the right number yet, but at least it's not a magic number Modified Paths: -------------- brlcad/branches/dmtogl/src/libdm/dm-togl.c Modified: brlcad/branches/dmtogl/src/libdm/dm-togl.c =================================================================== --- brlcad/branches/dmtogl/src/libdm/dm-togl.c 2010-06-02 19:01:36 UTC (rev 39504) +++ brlcad/branches/dmtogl/src/libdm/dm-togl.c 2010-06-02 19:28:26 UTC (rev 39505) @@ -235,30 +235,28 @@ GLint mm; int width, height, pwidth, pheight; + int borderleft, borderright, bordertop, borderbottom, bordertotal; + + borderleft = Tk_InternalBorderLeft(Tk_Parent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin)); + borderright = Tk_InternalBorderRight(Tk_Parent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin)); + bordertop = Tk_InternalBorderTop(Tk_Parent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin)); + borderbottom = Tk_InternalBorderBottom(Tk_Parent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin)); + + bordertotal = borderleft + borderright + bordertop + borderbottom; + if (dmp->dm_debugLevel) bu_log("togl_configureWin_guts()\n"); Togl_MakeCurrent(((struct togl_vars *)dmp->dm_vars.priv_vars)->togl); -/* - width = Togl_Width(((struct togl_vars *)dmp->dm_vars.priv_vars)->togl); - height = Togl_Height(((struct togl_vars *)dmp->dm_vars.priv_vars)->togl); -*/ + width = Tk_Width(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin); height = Tk_Height(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin); pwidth = Tk_Width(Tk_Parent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin)); pheight = Tk_Height(Tk_Parent(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin)); -/* - bu_log("width: %d\n", width); - bu_log("height: %d\n", height); - bu_log("parentwidth: %d\n", pwidth); - bu_log("parentheight: %d\n", pheight); - - if (pwidth > width) width = pwidth; - if (pheight > height) height = pheight; -*/ - if (pheight > height && (pheight - height != 8) && (height > pheight/2 + 8)) height = pheight - 8; + /* Manual height tweaking to ensure dm window fills available area */ + if (pheight > height && (pheight - height != bordertotal) && (height > pheight/2 + bordertotal)) height = pheight - bordertotal; Tk_ResizeWindow(Togl_TkWin(((struct togl_vars *)dmp->dm_vars.priv_vars)->togl), width, height); /* nothing to do */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |