[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[8366] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2012-09-20 21:16:54
|
Revision: 8366 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8366&view=rev Author: uckelman Date: 2012-09-20 21:16:42 +0000 (Thu, 20 Sep 2012) Log Message: ----------- Merged Brent-3.2-New@8362. Fixed Bug 4788: Resizing "Properties" windows doesn't extend text fields. Difference between 3.1.20 and 3.2.0-beta2. Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/counters/PieceDefiner.java Property Changed: ---------------- VASSAL-src/trunk/ Property changes on: VASSAL-src/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182,8233,8235-8238,8241,8244,8246,8260-8261,8309,8312,8317-8318 /VASSAL-src/branches/Brent-3.2:8206,8216-8217,8219-8220,8222,8225,8227,8248,8252 /VASSAL-src/branches/Brent-3.2-New:8263,8267,8269-8272,8279-8283,8289,8295-8297,8305,8314,8329,8334-8335,8353,8357-8358,8364 /VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995 /VASSAL-src/branches/george973-bugs:7800,7806,7962-7963 /VASSAL-src/branches/george973-bugs-3.2:8081 /VASSAL-src/branches/george973-ocs:8167-8169 /VASSAL-src/branches/lance-3.2 8085:8127 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930 /VASSAL-src/branches/uckelman-integration:7971-8007 /VASSAL-src/branches/uckelman-working2:7194-7700 /VASSAL-src/branches/viewport-3.2:7992 + /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182,8233,8235-8238,8241,8244,8246,8260-8261,8309,8312,8317-8318 /VASSAL-src/branches/Brent-3.2:8206,8216-8217,8219-8220,8222,8225,8227,8248,8252 /VASSAL-src/branches/Brent-3.2-New:8263,8267,8269-8272,8279-8283,8289,8295-8297,8305,8314,8329,8334-8335,8353,8357-8358,8362,8364 /VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995 /VASSAL-src/branches/george973-bugs:7800,7806,7962-7963 /VASSAL-src/branches/george973-bugs-3.2:8081 /VASSAL-src/branches/george973-ocs:8167-8169 /VASSAL-src/branches/lance-3.2 8085:8127 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930 /VASSAL-src/branches/uckelman-integration:7971-8007 /VASSAL-src/branches/uckelman-working2:7194-7700 /VASSAL-src/branches/viewport-3.2:7992 Modified: VASSAL-src/trunk/src/VASSAL/counters/PieceDefiner.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/counters/PieceDefiner.java 2012-09-20 19:59:33 UTC (rev 8365) +++ VASSAL-src/trunk/src/VASSAL/counters/PieceDefiner.java 2012-09-20 21:16:42 UTC (rev 8366) @@ -605,7 +605,7 @@ private void initialize(final EditablePiece p) { ed = p.getEditor(); setLayout(new MigLayout("ins 5","[]push[]push[]")); - add(ed.getControls(), "span 3,wrap"); + add(ed.getControls(), "span 3,growx,wrap"); final JPanel panel = new JPanel(new MigLayout()); JButton b = new JButton("Ok"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://ad.doubleclick.net/clk;258768047;13503038;j? http://info.appdynamics.com/FreeJavaPerformanceDownload.html _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |