Merge pull request #12102 from cain-kilgore/21664

WL 21664 - Window.innerHeight should not include the menu bar

MiladNazeri committed 8 years ago

Commit 30173152 parents 19106fc b26e31a2 files · +8 −7Browse files

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

Unified · Split

@@ -1,5 +1,5 @@
1	//	1	//
2	// WindowScriptingInterface.cpp	2	// WindowScriptingInterface.h
3	// interface/src/scripting	3	// interface/src/scripting
4	//	4	//
5	// Created by Ryan Huffman on 4/29/14.	5	// Created by Ryan Huffman on 4/29/14.
@@ -54,6 +54,7 @@ class WindowScriptingInterface : public QObject, public Dependency { · 48 unmodified lines
54	Q_PROPERTY(int innerHeight READ getInnerHeight)	54	Q_PROPERTY(int innerHeight READ getInnerHeight)
55	Q_PROPERTY(int x READ getX)	55	Q_PROPERTY(int x READ getX)
56	Q_PROPERTY(int y READ getY)	56	Q_PROPERTY(int y READ getY)
		57
57	public:	58	public:
58	WindowScriptingInterface();	59	WindowScriptingInterface();
59	~WindowScriptingInterface();	60	~WindowScriptingInterface();