Move UI-independent tree layout to game

Author: tturocy

Makefile.am

@@ -313,6 +313,8 @@ game_SOURCES = \
 	src/games/file.cc \
 	src/games/writer.cc \
 	src/games/writer.h \
+	src/games/layout.cc \
+    src/games/layout.h \
 	${agg_SOURCES} \
 	src/games/nash.h
 
@@ -589,8 +591,6 @@ gambit_SOURCES = \
 	src/gui/gamedoc.h \
 	src/gui/gameframe.cc \
 	src/gui/gameframe.h \
-	src/gui/layout.cc \
-	src/gui/layout.h \
 	src/gui/menuconst.h \
 	src/gui/nfgpanel.cc \
 	src/gui/nfgpanel.h \

src/gui/layout.cc src/games/layout.ccsrc/gui/layout.cc renamed to src/games/layout.cc

@@ -2,8 +2,8 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/gui/efglayout.h
-// Interface to tree layout representation
+// FILE: src/games/layout.h
+// Interface to generic tree layout representation
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -20,13 +20,13 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#ifndef GAMBIT_LAYOUT_H
-#define GAMBIT_LAYOUT_H
-
-#include "gambit.h"
+#ifndef GAMBIT_GAMES_TREELAYOUT_H
+#define GAMBIT_GAMES_TREELAYOUT_H
 
 #include <map>
 
+#include "gambit.h"
+
 namespace Gambit {
 struct LayoutEntry {
   friend class Layout;
@@ -59,4 +59,5 @@ class Layout {
   double GetMaxOffset() const { return m_maxOffset; }
 };
 } // namespace Gambit
-#endif // GAMBIT_LAYOUT_H
+
+#endif // GAMBIT_GAMES_TREELAYOUT_H

src/gui/layout.h src/games/layout.hsrc/gui/layout.h renamed to src/games/layout.h

@@ -29,10 +29,7 @@
 #include <wx/wx.h>
 #endif // WX_PRECOMP
 
-#include "gambit.h"
-#include "efgdisplay.h"
-
-#include "layout.h"
+#include "efglayout.h"
 
 namespace Gambit::GUI {
 namespace {

src/gui/efglayout.cc

@@ -26,7 +26,7 @@
 #include "gambit.h"
 #include "gamedoc.h"
 
-#include "layout.h"
+#include "games/layout.h"
 
 namespace Gambit::GUI {
 class NodeEntry {
@@ -118,7 +118,7 @@ class TreeLayout final : public GameView {
 
   /// Based on node levels and information set sublevels, compute the depth
   /// (X coordinate) of all nodes
-  void ComputeNodeDepths(const Gambit::Layout &) const;
+  void ComputeNodeDepths(const Layout &) const;
   void ComputeRenderedParents() const;
 
   wxString CreateNodeLabel(const std::shared_ptr<NodeEntry> &, int) const;