From 536794a2bd4a456dafc66126e36a81b998eee6df Mon Sep 17 00:00:00 2001
From: =?utf-8?q?C=C3=A9dric=20Cabessa?= <cedric.cabessa@uperto.com>
Date: Wed, 21 May 2008 14:24:19 +0200
Subject: [PATCH] review

---
 .../conference/conference/conferenceView.lzx       |   23 ++++++++++++++++-
 .../whiteboard/toolbar/baseToolbarMenu.lzx         |    2 +-
 .../modules/conference/whiteboard/whiteBoard.lzx   |   27 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/client/modules/conference/conference/conferenceView.lzx b/client/modules/conference/conference/conferenceView.lzx
index f8b93f5..35e7e62 100644
--- a/client/modules/conference/conference/conferenceView.lzx
+++ b/client/modules/conference/conference/conferenceView.lzx
@@ -49,7 +49,28 @@
 
 <class name="whiteBoardPanel" extends="guiPresenter" x="296" y="2"
     width="660" height="592" closable="false" title="Whiteboard"
-    resizeable="false">
+    resizeable="true">
+  <attribute name="initH"/>
+  <attribute name="initW"/>
+  <handler name="oninit">
+    <![CDATA[
+       this.setAttribute("initH",this.height);
+       this.setAttribute("initW",this.width);
+       var f=function() {
+         var w=this.height * this.initW/this.initH;
+         w=((w < this.initW ) ? initW : w);
+         var h=this.width * this.initH/this.initW;
+         h=((h < this.initH ) ? initH : h);
+
+         this.setWidth(w);
+         this.setHeight(h);
+       }
+       var prop1 = [this, "width"];
+       var prop2 = [this, "height"];
+       this.applyConstraint("width", f, prop1);
+       this.applyConstraint("height", f, prop2);
+      ]]>
+	</handler>
    <whiteBoard name="_whiteboard" y="22" x="4">
         <handler name="onsharedMessage" args="obj">
             //Debug.write("send: ",obj);
diff --git a/client/modules/conference/whiteboard/toolbar/baseToolbarMenu.lzx b/client/modules/conference/whiteboard/toolbar/baseToolbarMenu.lzx
index 5a1ea75..867385e 100644
--- a/client/modules/conference/whiteboard/toolbar/baseToolbarMenu.lzx
+++ b/client/modules/conference/whiteboard/toolbar/baseToolbarMenu.lzx
@@ -2,7 +2,7 @@
 <library>
     
 <class name="baseToolbarMenu" extends="view" layout="axis:x;spacing:2;inset:2" 
-    height="30" width="$once{ parent.parent.width-6 }" 
+    height="30" width="${ parent.parent.width-6 }" 
     bgcolor="$once{canvas.baseMousecolorizer}"  >
     <attribute name="selectedButton" value="null" />
     <method name="selectButton" args="obj,bool">		
diff --git a/client/modules/conference/whiteboard/whiteBoard.lzx b/client/modules/conference/whiteboard/whiteBoard.lzx
index cbc32be..b376c8e 100644
--- a/client/modules/conference/whiteboard/whiteBoard.lzx
+++ b/client/modules/conference/whiteboard/whiteBoard.lzx
@@ -240,9 +240,12 @@
     <!-- 
         The Content Area    
      -->
-    <view width="$once{ parent.parent.width-6 }" height="$once{ parent.parent.height-100 }" 
+    <view width="${ parent.parent.width-6 }" height="${ parent.parent.height-100 }" 
     	  y="68" name="_drawareaMask" clip="true" bgcolor="white" >
-        <baseDrawSave y="0" name="_drawarea" id="_drawarea" width="654" height="492" >
+        <baseDrawSave y="0" name="_drawarea" id="_drawarea" width="${parent.width}" height="${parent.height}" >
+            <attribute name="initH"/>
+            <attribute name="initW"/>
+
             <handler name="onprogress" args="perc">
                 //Debug.write("onprogress: ",perc);
                 this.parent.parent._progress.setProgress(perc);
@@ -288,6 +291,26 @@
                 this.parent.parent.sendObject = objectList;
                 this.parent.parent.sendMessageWithClientById.doCall();
             </method>
+	    <handler name="oninit">
+	      <![CDATA[
+	      this.setAttribute("initH",this.height);
+	      this.setAttribute("initW",this.width);
+	      var f=function() {
+                this.width=( (this.width < this.initW ) ? initW : this.width);
+                this.height=( (this.height < this.initH ) ? initH : this.height);
+                var mc = this.getMCRef();
+                // scale computed only on width
+                var scale= this.width / this.initW *100;
+                mc._xscale = scale;
+                mc._yscale = scale;
+	      }
+	      var prop1 = [this, "width"];
+	      this.applyConstraint("width", f, prop1);
+	      var prop2 = [this, "height"];
+	      this.applyConstraint("height", f, prop2);
+              ]]>
+	    </handler> 
+
         </baseDrawSave>  
     </view>
     
-- 
1.5.4.1