History

Merge branch 'master' into 21836

David Rowe committed 8 years ago

Commit 08defea2 parents c836014 11f509e454 files · +10724 −5955Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.h+5−2
@@ -33,8 +33,10 @@ · 32 unmodified lines
33 * @property {number} innerHeight - The height of the drawable area of the Interface window (i.e., without borders or other33 * @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>34 * chrome), in pixels. <em>Read-only.</em>
35 * @property {object} location - Provides facilities for working with your current metaverse location. See {@link location}.35 * @property {object} location - Provides facilities for working with your current metaverse location. See {@link location}.
36 * @property {number} x - The x coordinate of the top left corner of the Interface window on the display. <em>Read-only.</em>36 * @property {number} x - The x display coordinate of the top left corner of the drawable area of the Interface window.
37 * @property {number} y - The y coordinate of the top left corner of the Interface window on the display. <em>Read-only.</em>37 * <em>Read-only.</em>
38 * @property {number} y - The y display coordinate of the top left corner of the drawable area of the Interface window.
39 * <em>Read-only.</em>
38 */40 */
39 41
40class WindowScriptingInterface : public QObject, public Dependency {42class WindowScriptingInterface : public QObject, public Dependency {
@@ -522,6 +524,7 @@ public slots: · 481 unmodified lines
522 void closeMessageBox(int id);524 void closeMessageBox(int id);
523 525
524private slots:526private slots:
527 void onWindowGeometryChanged(const QRect& geometry);
525 void onMessageBoxSelected(int button);528 void onMessageBoxSelected(int button);
526 void disconnectedFromDomain();529 void disconnectedFromDomain();
527 530