svn commit: r1784879 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java

[solomax]

Author: solomax
Date: Wed Mar  1 08:45:44 2017
New Revision: 1784879

URL: http://svn.apache.org/viewvc?rev=1784879&view=rev
Log:
[OPENMEETINGS-1574] sizes are fixed

Modified:
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784879&r1=1784878&r2=1784879&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 Wed Mar  1 08:45:44 2017
@@ -278,8 +278,10 @@ public class Application extends Authent
                        rcl.setCanVideo(client.hasRight(Right.video) && 
client.isCamEnabled() && client.hasActivity(Activity.broadcastV));
                        rcl.setCanDraw(client.hasRight(Right.whiteBoard));
                        if (client.hasActivity(Activity.broadcastA) || 
client.hasActivity(Activity.broadcastV)) {
-                               rcl.setVWidth(client.getWidth());
-                               rcl.setVHeight(client.getHeight());
+                               if (rcl.getVWidth() == 0 || rcl.getVHeight() == 
0) {
+                                       rcl.setVWidth(client.getWidth());
+                                       rcl.setVHeight(client.getHeight());
+                               }
                                if (client.getPod() != Pod.none) {
                                        rcl.setInterviewPodId(client.getPod() 
== Pod.left ? 1 : 2);
                                }

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784879&r1=1784878&r2=1784879&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 Wed Mar  1 08:45:44 2017
@@ -278,8 +278,10 @@ public class Application extends Authent
                        rcl.setCanVideo(client.hasRight(Right.video) && 
client.isCamEnabled() && client.hasActivity(Activity.broadcastV));
                        rcl.setCanDraw(client.hasRight(Right.whiteBoard));
                        if (client.hasActivity(Activity.broadcastA) || 
client.hasActivity(Activity.broadcastV)) {
-                               rcl.setVWidth(client.getWidth());
-                               rcl.setVHeight(client.getHeight());
+                               if (rcl.getVWidth() == 0 || rcl.getVHeight() == 
0) {
+                                       rcl.setVWidth(client.getWidth());
+                                       rcl.setVHeight(client.getHeight());
+                               }
                                if (client.getPod() != Pod.none) {
                                        rcl.setInterviewPodId(client.getPod() 
== Pod.left ? 1 : 2);
                                }