History

Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements

Zach Fox committed 8 years ago

Commit 1da84092 parents c3d3cdc 8c6d83a199 files · +3356 −4569Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.h (1 of 199 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.h+5−1
@@ -28,7 +28,11 @@ · 27 unmodified lines
28 * physics.28 * physics.
29 *29 *
30 * @namespace Window30 * @namespace Window
31 * @property {number} innerWidth - The width of the drawable area of the Interface window (i.e., without borders or other 31 *
32 * @hifi-interface
33 * @hifi-client-entity
34 *
35 * @property {number} innerWidth - The width of the drawable area of the Interface window (i.e., without borders or other
32 * chrome), in pixels. <em>Read-only.</em>36 * chrome), in pixels. <em>Read-only.</em>
33 * @property {number} innerHeight - The height of the drawable area of the Interface window (i.e., without borders or other37 * @property {number} innerHeight - The height of the drawable area of the Interface window (i.e., without borders or other
34 * chrome), in pixels. <em>Read-only.</em>38 * chrome), in pixels. <em>Read-only.</em>