WAGE: Fix resizing and text selection bug

Revise/Simplify old optional text rendering
Set things up a bit for selected text rendering
Add MacTextWindow::clearText and MacTextWindow::setSelection
Add MacTextWindow::appendText variant that accepts a MacFont

1 files changed, 18 insertions, 3 deletions

diff --git a/graphics/macgui/mactextwindow.h b/graphics/macgui/mactextwindow.h
index 3ef928eab9..f302f3724d 100644
--- a/graphics/macgui/mactextwindow.h
+++ b/graphics/macgui/mactextwindow.h
@@ -28,20 +28,35 @@
 
 namespace Graphics {
 
+struct SelectedText {
+	int startX = 0, startY = 0;
+	int endX = 0, endY = 0;
+
+	bool needsRender() {
+		return startX != endX || startY != endY;
+	}
+};
+
 class MacTextWindow : public MacWindow {
 public:
-	MacTextWindow(MacWindowManager *wm, const Font *font, int fgcolor,
+	MacTextWindow(MacWindowManager *wm, const MacFont *font, int fgcolor,
 		int bgcolor, int maxWidth, TextAlign textAlignment);
 	~MacTextWindow();
 
-	const Font *getTextWindowFont();
+	const MacFont *getTextWindowFont();
 
 	void drawText(ManagedSurface *g, int x, int y, int w, int h, int xoff, int yoff);
 	void appendText(Common::String str, int fontId = kMacFontChicago, int fontSize = 12, int fontSlant = kMacFontRegular);
+	void appendText(Common::String str, const MacFont *macFont);
+	void clearText();
+
+	void setSelection(int selStartX, int selStartY, int selEndX, int selEndY);
 
 private:
 	MacText *_mactext;
-	const Font *_font;
+	const MacFont *_font;
+
+	SelectedText _selectedText;
 };
 
 } // End of namespace Graphics