You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/11/11 08:11:58 UTC
svn commit: r1769251 - in
/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf:
base/components/panel/ modules/conference/flexibleConferenceRoom/
modules/conference/whiteboard/panels/propertypanel/
Author: solomax
Date: Fri Nov 11 08:11:58 2016
New Revision: 1769251
URL: http://svn.apache.org/viewvc?rev=1769251&view=rev
Log:
no jira: WB document properties panel is fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx?rev=1769251&r1=1769250&r2=1769251&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx Fri Nov 11 08:11:58 2016
@@ -38,7 +38,8 @@
<attribute name="initheight" value="0" type="number" />
<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
-
+ <attribute name="titlePos" type="number" value="0" />
+
<method name="setLabelId" args="_labelid" >
this.labelid = _labelid;
this.title=canvas.getLabelName(this.labelid);
@@ -55,10 +56,10 @@
}
</method>
- <handler name="oninit">
- if ($debug) Debug.write("basePropertyPanel:: oninit");
- this.initheight=this.height;
- </handler>
+ <handler name="oninit">
+ if ($debug) Debug.write("basePropertyPanel:: oninit");
+ this.initheight=this.height;
+ </handler>
<view width="${ this.parent.width }" height="${ this.parent.height-2 }"
x="0" y="1" />
@@ -70,36 +71,34 @@
<view x="0" y="19" width="${ this.parent.width }" height="1" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" />
- <view x="0" y="1" width="${ this.parent.width }" height="20" >
-
+ <view name="_titleView" x="${ parent.titlePos }" y="1" width="${ this.parent.width - parent.titlePos }" height="20" >
<handler name="onclick">
- this.parent.toggleopen();
- </handler>
+ this.parent.toggleopen();
+ </handler>
- <text fontsize="11" height="17" x="16" y="1" text="${ this.parent.parent.title }"
+ <text fontsize="11" height="17" x="${ parent.parent.titlePos + 16 }" y="1" text="${ this.parent.parent.title }"
fgcolor="$once{ canvas.getThemeColor('menuTextColor') }" resize="true" fontstyle="bold" />
-
+
<button visible="${ this.parent.parent.closable }" x="${ this.parent.parent.width-23 }"
y="1" text="X" height="18" width="20" >
<handler name="onmouseup">
this.parent.parent.close();
- </handler>
+ </handler>
</button>
- <view visible="${ !this.parent.parent.isopen }" x="2" y="2" resource="conferenceBox_button_min_small_rsc">
+ <view visible="${ !this.parent.parent.isopen }" x="${ parent.parent.titlePos + 2 }" y="2" resource="conferenceBox_button_min_small_rsc">
<handler name="onmouseup">
this.parent.parent.toggleopen();
</handler>
- <labelTooltip name="_labelTooltip" labelid="857" />
+ <labelTooltip name="_labelTooltip" labelid="857" />
</view>
- <view visible="${ this.parent.parent.isopen }" x="2" y="2" resource="conferenceBox_button_max_small_rsc">
+ <view visible="${ this.parent.parent.isopen }" x="${ parent.parent.titlePos + 2 }" y="2" resource="conferenceBox_button_max_small_rsc">
<handler name="onmouseup">
this.parent.parent.toggleopen();
</handler>
- <labelTooltip name="_labelTooltip" labelid="856" />
+ <labelTooltip name="_labelTooltip" labelid="856" />
</view>
-
</view>
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1769251&r1=1769250&r2=1769251&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Fri Nov 11 08:11:58 2016
@@ -34,7 +34,7 @@
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - 6 + 28 }" />
+ height="${ canvas.height }" />
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1769251&r1=1769250&r2=1769251&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx Fri Nov 11 08:11:58 2016
@@ -21,10 +21,10 @@
<library>
<class name="propertyPanel" extends="basePropertyPanel"
- width="${ parent.parent.width-1 }" height="100" labelid="843" >
-
+ width="${ parent.parent.width-1 }" height="100" labelid="843" titlePos="150">
+
<attribute name="ignoreUpdates" value="false" type="boolean" />
-
+
<method name="setObjectBounds" args="x,y,width,height">
if ($debug) Debug.write("setObjectBounds: ",x,y,width,height);
this._content._xvalue.setAttribute('text',x);