Revision: 4395
http://vexi.svn.sourceforge.net/vexi/?rev=4395&view=rev
Author: clrg
Date: 2012-05-31 12:49:29 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Code clean only
Modified Paths:
--------------
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/splitpane.t
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/splitpane.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/splitpane.t
2012-05-31 12:44:44 UTC (rev 4394)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/splitpane.t
2012-05-31 12:49:29 UTC (rev 4395)
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 - see COPYING for details [LGPL] -->
+<!-- Copyright 2012 - see COPYING for details [LGPL] -->
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="org.vexi.lib.role">
<meta:doc>
@@ -41,12 +41,15 @@
/*if (cur_b!=master)*/ shift =
min(dim_b - cur_d[dim] - cur_b[0][contentdim],
max(dim_b - cur_d[dim] - cur_b[0][maxdim], shift));
- // resize non-master children
+
if (liveresize) {
- if (cur_a!=master) cur_a[dim] = dim_a + shift;
- if (cur_b!=master) cur_b[dim] = dim_b - shift;
- // store sizes for later application
+ // resize non-master children
+ if (cur_a!=master)
+ cur_a[dim] = dim_a + shift;
+ if (cur_b!=master)
+ cur_b[dim] = dim_b - shift;
} else {
+ // store sizes for later application
tmp_a = dim_a + shift;
tmp_b = dim_b - shift;
th_marker[pos] = cur_a[pos] + tmp_a + markeroffset;
@@ -60,8 +63,10 @@
cur_d.active = false;
th_marker.display = false;
if (!liveresize) {
- if (cur_a!=master) cur_a[dim] = tmp_a;
- if (cur_b!=master) cur_b[dim] = tmp_b;
+ if (cur_a!=master)
+ cur_a[dim] = tmp_a;
+ if (cur_b!=master)
+ cur_b[dim] = tmp_b;
}
}
@@ -95,7 +100,8 @@
tmp_b = dim_b;
// marker provides visual feedback if !liveresize
th_marker.display = !liveresize;
- if (liveresize) th_marker[pos] = cur_a[pos] + cur_a[dim] +
markeroffset;
+ if (liveresize)
+ th_marker[pos] = cur_a[pos] + cur_a[dim] + markeroffset;
}
/** ensure master is not constrained */
@@ -127,8 +133,14 @@
v_holding[i][fls] = false;
} else {
var shell = v_holding[i];
- if (shell[fls]) { shell[fls] = false; shell[0][fls] =
true; }
- if (shell[0][shr]) { shell[shr] = true; shell[0][shr] =
false; }
+ if (shell[fls]) {
+ shell[fls] = false;
+ shell[0][fls] = true;
+ }
+ if (shell[0][shr]) {
+ shell[shr] = true;
+ shell[0][shr] = false;
+ }
}
}
}
@@ -150,13 +162,14 @@
v_content.Children ++= function(c) {
// useful through this trap
var i = arguments.trapname;
- // children are placed inside a shell box which can
- // have dimensions altered without causing issues
if (c != null) {
- // set up divider
+ // children are placed inside a shell box which can
+ // have dimensions altered without causing issues
+
var div = null;
if (v_holding.numchildren>0) {
- div = vexi..vexi.theme.divider(vexi.box);
+ // set up divider
+ div = new vexi..vexi.theme.divider();
div[shr] = true;
div[flip(shr)] = false;
div.dragStart ++= dragStart;
@@ -164,18 +177,25 @@
div.dragUpdate ++= dragUpdate;
}
// assign new child and divider to holding
- if (div and i!=0) v_holding[i*2-1] = div;
+ if (div and i!=0)
+ v_holding[i*2-1] = div;
var shell = vexi.box;
shell[0] = c;
- if (c[shr]) { shell[shr] = true; c[shr] = false; }
+ if (c[shr]) {
+ c[shr] = false;
+ shell[shr] = true;
+ }
v_holding[i*2] = shell;
- if (div and i==0) v_holding[1] = div;
+ if (div and i==0)
+ v_holding[1] = div;
// REMARK - not kept in v_content so no cascade
} else {
// remove both child and accompanying dividor
- if (i==0 and v_holding.numchildren>1) v_holding[1] = null;
+ if (i==0 and v_holding.numchildren>1)
+ v_holding[1] = null;
v_holding[i*2] = null;
- if (i!=0) v_holding[i*2-1] = null;
+ if (i!=0)
+ v_holding[i*2-1] = null;
}
return;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
