From 42cb321039fe2fe92533485a02eb25c5ac5c0eea Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 10 Aug 2022 01:00:29 +0200
Subject: [PATCH] Amend previous commit (window settings, ignore size)

When loading a session it is preferable to use the window size from
Config's instant.xml (local machine screen sizes).
---
 gtk2_ardour/ardour_ui_dependents.cc | 56 ++++++++++++++---------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index b704b56e56..7395653bc6 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -372,38 +372,41 @@ ARDOUR_UI::apply_window_settings (bool with_size)
 		return 0;
 	}
 
-	XMLProperty const * prop;
-	gint x = -1;
-	gint y = -1;
-	gint w = -1;
-	gint h = -1;
+	XMLProperty const* prop;
 
-	if ((prop = mnode->property (X_("x"))) != 0) {
-		x = atoi (prop->value());
-	}
+	if (with_size) {
+		gint x = -1;
+		gint y = -1;
+		gint w = -1;
+		gint h = -1;
 
-	if ((prop = mnode->property (X_("y"))) != 0) {
-		y = atoi (prop->value());
-	}
+		if ((prop = mnode->property (X_("x"))) != 0) {
+			x = atoi (prop->value());
+		}
 
-	if ((prop = mnode->property (X_("w"))) != 0) {
-		w = atoi (prop->value());
-	}
+		if ((prop = mnode->property (X_("y"))) != 0) {
+			y = atoi (prop->value());
+		}
 
-	if ((prop = mnode->property (X_("h"))) != 0) {
-		h = atoi (prop->value());
-	}
+		if ((prop = mnode->property (X_("w"))) != 0) {
+			w = atoi (prop->value());
+		}
 
-	if (x >= 0 && y >= 0 && w >= 0 && h >= 0) {
-		_main_window.set_position (Gtk::WIN_POS_NONE);
-	}
+		if ((prop = mnode->property (X_("h"))) != 0) {
+			h = atoi (prop->value());
+		}
 
-	if (x >= 0 && y >= 0) {
-		_main_window.move (x, y);
-	}
+		if (x >= 0 && y >= 0 && w >= 0 && h >= 0) {
+			_main_window.set_position (Gtk::WIN_POS_NONE);
+		}
 
-	if (w > 0 && h > 0) {
-		_main_window.set_default_size (w, h);
+		if (x >= 0 && y >= 0) {
+			_main_window.move (x, y);
+		}
+
+		if (w > 0 && h > 0) {
+			_main_window.set_default_size (w, h);
+		}
 	}
 
 	std::string current_tab;
@@ -414,9 +417,6 @@ ARDOUR_UI::apply_window_settings (bool with_size)
 		current_tab = "editor";
 	}
 
-	std::cout << "CURRENT TAB: " << current_tab << "\n";
-
-
 	if (mixer && current_tab == "mixer") {
 		_tabs.set_current_page (_tabs.page_num (mixer->contents()));
 	} else if (rc_option_editor && current_tab == "preferences") {