GLK: Add methods for sending windows to the front/back of draw order

scummvm · Aug 9, 2019 · b2f6280 · b2f6280
1 parent 6fe59d1
commit b2f6280
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/engines/glk/utils.h b/engines/glk/utils.h
@@ -67,6 +67,15 @@ template<class T>class Array : public Common::Array<T> {
 
 		return -1;
 	}
+
+	/**
+	 * Remove an item from an array by value
+	 */
+	void remove(T val) {
+		int index = indexOf(val);
+		if (index != -1)
+			Common::Array<T>::remove_at(index);
+	}
 };
 
 /**

diff --git a/engines/glk/windows.cpp b/engines/glk/windows.cpp
@@ -735,6 +735,24 @@ void Window::getSize(uint *width, uint *height) const {
 		*height = 0;
 }
 
+void Window::bringToFront() {
+	PairWindow *pairWin = dynamic_cast<PairWindow *>(_parent);
+
+	if (pairWin && pairWin->_dir == winmethod_Arbitrary && pairWin->_children.back() != this) {
+		pairWin->_children.remove(this);
+		pairWin->_children.push_back(this);
+	}
+}
+
+void Window::sendToBack() {
+	PairWindow *pairWin = dynamic_cast<PairWindow *>(_parent);
+
+	if (pairWin && pairWin->_dir == winmethod_Arbitrary && pairWin->_children.front() != this) {
+		pairWin->_children.remove(this);
+		pairWin->_children.insert_at(0, this);
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 BlankWindow::BlankWindow(Windows *windows, uint rock) : Window(windows, rock) {

diff --git a/engines/glk/windows.h b/engines/glk/windows.h
@@ -581,6 +581,16 @@ class Window {
 	 * Returns a pointer to the styles for the window
 	 */
 	virtual const WindowStyle *getStyles() const;
+
+	/**
+	 * In arbitrary window positioning mode, brings a window to the front of all other windows
+	 */
+	void bringToFront();
+
+	/**
+	 * In arbitrary window positioning mode, sends a window to the back of all other windows
+	 */
+	void sendToBack();
 };
 typedef Window *winid_t;