nobody at rubyforge.org
2006-Dec-30 01:15 UTC
[Wxruby-development] [809] trunk/wxsugar/lib/wx_sugar/layout.rb: Fix default sizers to arrange_vertically, add padding on specified sides
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:'':'';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[809] trunk/wxsugar/lib/wx_sugar/layout.rb: Fix default sizers to arrange_vertically, add padding on specified sides</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>809</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2006-12-29 20:15:57 -0500 (Fri, 29 Dec 2006)</dd> </dl> <h3>Log Message</h3> <pre>Fix default sizers to arrange_vertically, add padding on specified sides</pre> <h3>Modified Paths</h3> <ul> <li><a href="#trunkwxsugarlibwx_sugarlayoutrb">trunk/wxsugar/lib/wx_sugar/layout.rb</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="trunkwxsugarlibwx_sugarlayoutrb"></a> <div class="modfile"><h4>Modified: trunk/wxsugar/lib/wx_sugar/layout.rb (808 => 809)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxsugar/lib/wx_sugar/layout.rb        2006-12-29 12:32:29 UTC (rev 808) +++ trunk/wxsugar/lib/wx_sugar/layout.rb        2006-12-30 01:15:57 UTC (rev 809) </span><span class="lines">@@ -67,7 +67,9 @@ </span><span class="cx"> elsif sizer = self.get_sizer </span><span class="cx"> return sizer </span><span class="cx"> else </span><del>- return @current_sizer = Wx::BoxSizer.new(Wx::VERTICAL) </del><ins>+ @current_sizer = Wx::BoxSizer.new(Wx::VERTICAL) + self.set_sizer(@current_sizer) + @current_sizer </ins><span class="cx"> end </span><span class="cx"> end </span><span class="cx"> </span><span class="lines">@@ -106,6 +108,9 @@ </span><span class="cx"> end </span><span class="cx"> # set as main sizer </span><span class="cx"> else </span><ins>+ if @current_sizer + warn "Sizer already specified, redefining layout for #{self}" + end </ins><span class="cx"> @padding = layout[:padding] if layout[:padding] </span><span class="cx"> @current_sizer = a_sizer </span><span class="cx"> yield(self) if block_given? </span><span class="lines">@@ -123,7 +128,7 @@ </span><span class="cx"> child = build_child(child) </span><span class="cx"> layout = hints_to_constants(layout_hints) </span><span class="cx"> proportion = layout_hints[:proportion] || 0 </span><del>- siz = self.current_sizer() </del><ins>+ siz = self.current_sizer </ins><span class="cx"> padding = layout_hints[:padding] || @padding </span><span class="cx"> siz.add(child, proportion, layout, padding || 0) </span><span class="cx"> siz.layout() </span><span class="lines">@@ -205,11 +210,17 @@ </span><span class="cx"> end </span><span class="cx"> end </span><span class="cx"> </span><del>- </del><span class="cx"> # Convert a hash of layout hints to WxWidgets Sizer constants </span><ins>+ </ins><span class="cx"> def hints_to_constants(layout_hints) </span><del>- layout = Wx::ALL - </del><ins>+ if layout_hints[:pad] + layout = layout_hints[:pad].split('','').inject(0) do | l, edge | + l | Wx::const_get(edge.upcase) + end + else + layout = Wx::ALL + end + </ins><span class="cx"> if layout_hints[:minsize] </span><span class="cx"> layout = layout | Wx::ADJUST_MINSIZE|Wx::EXPAND </span><span class="cx"> end </span><span class="lines">@@ -218,9 +229,9 @@ </span><span class="cx"> end </span><span class="cx"> </span><span class="cx"> </span><del>- if layout_hints[:align] </del><ins>+ if align = layout_hints[:align] </ins><span class="cx"> begin </span><del>- align_const = Wx::const_get(''ALIGN_'' << layout_hints[:align].to_s.upcase) </del><ins>+ align_const = Wx::const_get(''ALIGN_'' << align.to_s.upcase) </ins><span class="cx"> layout = layout | align_const </span><span class="cx"> rescue NameError </span><span class="cx"> Kernel.raise ArgumentError, </span></span></pre> </div> </div> </body> </html>
Seemingly Similar Threads
- [811] trunk/wxsugar/lib/wx_sugar/layout.rb: Yield the sizer rather than the underlying parent to an ''arrange'' block
- [912] trunk/wxsugar/lib: Overview documentation moved to lib/wx_sugar.rb
- [773] trunk/wxsugar/lib/wx_sugar/all.rb: Updated overview, deprecated itemdata
- [945] trunk/wxsugar/lib/wx_sugar.rb: Add note about enumerable_controls, reorder list of extensions
- [774] trunk/wxsugar/lib/wx_sugar.rb: Shortcut to allow just "require ''wx_sugar''" to work