Revision: 3800
Author: seba.wagner
Date: Sat Jun 11 01:36:43 2011
Log: Fixes: Whiteboard width/height + draw minimum *dot* also if only
single click
http://code.google.com/p/openmeetings/source/detail?r=3800
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Tue Apr 26 02:23:02 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Sat Jun 11 01:36:43 2011
@@ -52,6 +52,9 @@
this.drawlineOnObject(this.currentlayer,-1,-1,0,0);
this.drawlineOnObject(this.currentlayer,this.width,this.height,this.width+1,this.height+1);
+ this.startx = this.currentlayer.getMouse('x');
+ this.starty = this.currentlayer.getMouse('y');
+
//Set previous to null
this.prevx = null;
this.prevy = null;
@@ -103,7 +106,45 @@
var width = maxx-minx;
var height = maxy-miny;
- if ($debug) Debug.write("## 1 ## NEW x,y ",minx,miny,"
width,height: ",width,height);
+ //if ($debug) Debug.info("## 1 ## NEW x,y ",minx,miny,"
width,height: ",width,height);
+
+ if (width < 2 && height < 2) {
+
+ //if ($debug) Debug.info("Add minimum size of Painting Line");
+
+ if (this.basetempactionobjectList.length > 0) {
+
+ var lastPoint =
this.basetempactionobjectList[this.basetempactionobjectList.length-1];
+
+ var actionObject = new Array();
+ actionObject[0] = 'point';
+ actionObject[1] = lastPoint[3];
+ actionObject[2] = lastPoint[4];
+ actionObject[3] = lastPoint[3]+2;
+ actionObject[4] = lastPoint[4]+2;
+ this.basetempactionobjectList.push(actionObject);
+
+ } else {
+
+ //if ($debug) Debug.info("## 2 ## CURRENT
width,height ",this.width,this.height);
+
+ minx = this.startx;
+ miny = this.starty;
+
+ var actionObject = new Array();
+ actionObject[0] = 'point';
+ actionObject[1] = 0;
+ actionObject[2] = 0;
+ actionObject[3] = 2;
+ actionObject[4] = 2;
+ this.basetempactionobjectList.push(actionObject);
+
+ width = 2;
+ height = 2;
+
+ }
+
+ }
if(this.isSnapToGrid){
@@ -111,12 +152,12 @@
ygrid = Math.round((miny-1)/this.gridWidth)*this.gridWidth;
this.currentlayer = new lz.drawViewNew(this,{
- name:tempName,x:xgrid,y:ygrid,width:width,height:height,
- opacity:this.currentlayerOpacity});
+
name:tempName,x:xgrid,y:ygrid,width:width,height:height,
+ opacity:this.currentlayerOpacity});
}else{
this.currentlayer = new lz.drawViewNew(this,{
- name:tempName,x:minx-1,y:miny-1,width:width,height:height,
- opacity:this.currentlayerOpacity});
+
name:tempName,x:minx-1,y:miny-1,width:width,height:height,
+ opacity:this.currentlayerOpacity});
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Tue Apr 26 02:04:56 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Sat Jun 11 01:36:43 2011
@@ -215,7 +215,7 @@
parent.setAttribute("bgcolor",0xFFFFFF);
</handler>
- <remoteWhiteboard y="0" name="_drawarea" isRemoteOID="true"
+ <remoteWhiteboard y="0" name="_drawarea" isRemoteOID="true"
height="${parent.height}" width="${parent.height}"
restricted="$once{ parent.parent.restricted }" >
<attribute name="sendUpdate" value="true" type="boolean"/>
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
