Author: solomax
Date: Wed Nov 23 05:24:55 2016
New Revision: 1770911
URL: http://svn.apache.org/viewvc?rev=1770911&view=rev
Log:
[OPENMEETINGS-1510] 2 mouse down in a row should be better handled
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1770911&r1=1770910&r2=1770911&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
Wed Nov 23 05:24:55 2016
@@ -25,7 +25,6 @@
<when property="$as3">
<passthrough>
import flash.printing.PrintJob;
- import flash.events.MouseEvent;
</passthrough>
</when>
</switch>
@@ -64,7 +63,6 @@
<attribute name="selectedObjects" value="null"/>
<attribute name="ObjectByName" value="null" />
- <attribute name="originalFrameRate" type="number" value="0"/>
<method name="getCounter">
//Debug.write("### getCounter :",this.counter);
@@ -547,10 +545,6 @@
this.doSetHandBodus();
} else if(this.drawmodus=="paint"){
this.startPaint();
- originalFrameRate =
canvas.sprite.stage.frameRate;
- canvas.sprite.stage.frameRate = 60;
- if ($debug) Debug.write("Current FPS: ",
canvas.sprite.stage.frameRate);
-
canvas.sprite.stage.addEventListener(MouseEvent.MOUSE_MOVE, drawLine);
} else if(this.drawmodus=="line"){
this.startLine(null);
this.startx = currentlayer.getMouse('x');
@@ -608,10 +602,6 @@
]]>
</method>
- <method name="drawLine" args="e">
- //fake
- </method>
-
<method name="onmouseupMethod" >
<![CDATA[
if ($debug) Debug.write("onmouseupMethod this.drawmodus:
",this.drawmodus);
@@ -641,8 +631,6 @@
this.onsharedMessage('moveMap',tArray);
} else if(this.drawmodus=="paint"){
- canvas.sprite.stage.frameRate =
originalFrameRate;
-
canvas.sprite.stage.addEventListener(MouseEvent.MOUSE_MOVE, drawLine);
this.endPaint();
} else if(this.drawmodus=="line"){
this.endLine();
@@ -724,24 +712,6 @@
//if ($debug) Debug.info("..trackmouse ", mx, my, item);
if (this.drawmodus=="paint") {
- if (mx != prevx || my != prevy) {
- if (prevx == null) {
- prevx = mx;
- }
- if (prevy == null) {
- prevy = my;
- }
- var mmx = this.mx;
- var mmy = this.my;
- var px = this.prevx;
- var py = this.prevy;
-
- this.drawline(px, py, mmx, mmy);
- this.drawlineRegisterPaint(px, py, mmx, mmy);
-
- this.prevx = this.mx;
- this.prevy = this.my;
- }
} else if (this.drawmodus=="line"){
var oid_name = this.currentlayer.name;
this.currentlayer.destroy();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx?rev=1770911&r1=1770910&r2=1770911&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Wed Nov 23 05:24:55 2016
@@ -24,6 +24,7 @@
<when property="$as3">
<passthrough>
import flash.geom.Point;
+ import flash.events.MouseEvent;
</passthrough>
</when>
</switch>
@@ -37,6 +38,8 @@
<attribute name="maxy" value="0" type="number" />
<attribute name="g" type="object"/>
<attribute name="points" type="object"/>
+ <attribute name="originalFrameRate" type="number" value="0"/>
+ <attribute name="paintStarted" type="boolean" value="false"/>
<method name="drawline" args="x1,y1,x2,y2">
drawlineOnObject(currentlayer, x1, y1, x2, y2);
@@ -71,6 +74,14 @@
<method name="startPaint">
<![CDATA[
+ if (paintStarted) {
+ endPaint();
+ }
+ originalFrameRate = canvas.sprite.stage.frameRate;
+ canvas.sprite.stage.frameRate = 60;
+ if ($debug) Debug.write("Current FPS: ",
canvas.sprite.stage.frameRate);
+
canvas.sprite.stage.addEventListener(MouseEvent.MOUSE_MOVE, drawLine);
+ paintStarted = true;
//Debug.write("startPaint ",this.startx,this.starty);
this.currentlayer = new lz.drawViewNew(this, {
name : 'paint' +
this.getCounter(),
@@ -110,6 +121,11 @@
<method name="endPaint">
<![CDATA[
+ if (!paintStarted) {
+ return;
+ }
+ canvas.sprite.stage.frameRate = originalFrameRate;
+
canvas.sprite.stage.removeEventListener(MouseEvent.MOUSE_MOVE, drawLine);
if ($debug) Debug.write("endPaint:: ", minx, miny,
points);
var tempName = this.currentlayer.name;
this.currentlayer.destroy();
@@ -176,6 +192,7 @@
this.layers.push(this.currentlayer);
this.registerFinal(this.getSWFDocumentStatus(),
this.getZIndex());
+ paintStarted = false;
]]>
</method>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1770911&r1=1770910&r2=1770911&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
Wed Nov 23 05:24:55 2016
@@ -25,7 +25,6 @@
<when property="$as3">
<passthrough>
import flash.printing.PrintJob;
- import flash.events.MouseEvent;
</passthrough>
</when>
</switch>
@@ -64,7 +63,6 @@
<attribute name="selectedObjects" value="null"/>
<attribute name="ObjectByName" value="null" />
- <attribute name="originalFrameRate" type="number" value="0"/>
<method name="getCounter">
//Debug.write("### getCounter :",this.counter);
@@ -547,10 +545,6 @@
this.doSetHandBodus();
} else if(this.drawmodus=="paint"){
this.startPaint();
- originalFrameRate =
canvas.sprite.stage.frameRate;
- canvas.sprite.stage.frameRate = 60;
- if ($debug) Debug.write("Current FPS: ",
canvas.sprite.stage.frameRate);
-
canvas.sprite.stage.addEventListener(MouseEvent.MOUSE_MOVE, drawLine);
} else if(this.drawmodus=="line"){
this.startLine(null);
this.startx = currentlayer.getMouse('x');
@@ -608,10 +602,6 @@
]]>
</method>
- <method name="drawLine" args="e">
- //fake
- </method>
-
<method name="onmouseupMethod" >
<![CDATA[
if ($debug) Debug.write("onmouseupMethod this.drawmodus:
",this.drawmodus);
@@ -641,8 +631,6 @@
this.onsharedMessage('moveMap',tArray);
} else if(this.drawmodus=="paint"){
- canvas.sprite.stage.frameRate =
originalFrameRate;
-
canvas.sprite.stage.addEventListener(MouseEvent.MOUSE_MOVE, drawLine);
this.endPaint();
} else if(this.drawmodus=="line"){
this.endLine();
@@ -724,24 +712,6 @@
//if ($debug) Debug.info("..trackmouse ", mx, my, item);
if (this.drawmodus=="paint") {
- if (mx != prevx || my != prevy) {
- if (prevx == null) {
- prevx = mx;
- }
- if (prevy == null) {
- prevy = my;
- }
- var mmx = this.mx;
- var mmy = this.my;
- var px = this.prevx;
- var py = this.prevy;
-
- this.drawline(px, py, mmx, mmy);
- this.drawlineRegisterPaint(px, py, mmx, mmy);
-
- this.prevx = this.mx;
- this.prevy = this.my;
- }
} else if (this.drawmodus=="line"){
var oid_name = this.currentlayer.name;
this.currentlayer.destroy();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx?rev=1770911&r1=1770910&r2=1770911&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Wed Nov 23 05:24:55 2016
@@ -24,6 +24,7 @@
<when property="$as3">
<passthrough>
import flash.geom.Point;
+ import flash.events.MouseEvent;
</passthrough>
</when>
</switch>
@@ -37,6 +38,8 @@
<attribute name="maxy" value="0" type="number" />
<attribute name="g" type="object"/>
<attribute name="points" type="object"/>
+ <attribute name="originalFrameRate" type="number" value="0"/>
+ <attribute name="paintStarted" type="boolean" value="false"/>
<method name="drawline" args="x1,y1,x2,y2">
drawlineOnObject(currentlayer, x1, y1, x2, y2);
@@ -71,6 +74,14 @@
<method name="startPaint">
<![CDATA[
+ if (paintStarted) {
+ endPaint();
+ }
+ originalFrameRate = canvas.sprite.stage.frameRate;
+ canvas.sprite.stage.frameRate = 60;
+ if ($debug) Debug.write("Current FPS: ",
canvas.sprite.stage.frameRate);
+
canvas.sprite.stage.addEventListener(MouseEvent.MOUSE_MOVE, drawLine);
+ paintStarted = true;
//Debug.write("startPaint ",this.startx,this.starty);
this.currentlayer = new lz.drawViewNew(this, {
name : 'paint' +
this.getCounter(),
@@ -110,6 +121,11 @@
<method name="endPaint">
<![CDATA[
+ if (!paintStarted) {
+ return;
+ }
+ canvas.sprite.stage.frameRate = originalFrameRate;
+
canvas.sprite.stage.removeEventListener(MouseEvent.MOUSE_MOVE, drawLine);
if ($debug) Debug.write("endPaint:: ", minx, miny,
points);
var tempName = this.currentlayer.name;
this.currentlayer.destroy();
@@ -176,6 +192,7 @@
this.layers.push(this.currentlayer);
this.registerFinal(this.getSWFDocumentStatus(),
this.getZIndex());
+ paintStarted = false;
]]>
</method>
