From fe0c803da4e61452dbba2f2200128f8f24953489 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sat, 5 Dec 2009 22:41:54 +0000
Subject: [PATCH] Add save button

---
 images/icons/save.png      | Bin 0 -> 529 bytes
 include/GameScreens.hpp    |   1 -
 include/gui/FromBottom.hpp |  38 +++++++++++++++++++++++++++++++
 include/gui/ILayout.hpp    |   3 ++-
 layouts/editor.xml         |  11 +++++++++
 schemas/layout.xsd         |  12 ++++++++++
 src/Editor.cpp             |  28 ++++++++++-------------
 src/Main.cpp               |   2 +-
 src/gui/FromBottom.cpp     |  45 +++++++++++++++++++++++++++++++++++++
 src/gui/Layout.cpp         |   9 ++++++++
 src/gui/RenderContext.cpp  |   5 ++++-
 11 files changed, 134 insertions(+), 20 deletions(-)
 create mode 100644 images/icons/save.png
 create mode 100644 include/gui/FromBottom.hpp
 create mode 100644 src/gui/FromBottom.cpp

diff --git a/images/icons/save.png b/images/icons/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea64d4ca94891b0590f29b0d403d54b81842289
GIT binary patch
literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;xB9ApmMe`;g55000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXh-
z79};UATe?P00EInL_t(o!|j&MN+dB9M$b)BU6l;<Ky?ppEYO7w;*2|?o}hO93_gXM
zc@ce|f!XOo1;LHNG`dn(1OBBli|%O!%f_k}TA{vO<%Z<s)|Z<Lty(QuQZ=}gZ3hv}
z!~GTB|ApXdFC2CHDD4o@h>E#9->uxsRAUMKZv!qyzxcURkfv#EfIQDBhI^#xGB-Du
zug){GlOv>QN>LQG0kSN^L|@12h`c&aE!qPuKnt*N05h|g#C`HSC(E*CRZetsfDk-N
zB^1NG$$hTBdFgKf*E9oxUT=lapbS4LMnpCL1t5r+IbWN(03ehPwX+~9nw(tbGvR+P
zY^)s<LZ~)s6yd$6EX(P49LMY*e}5DBoAMh%U~6+7tzWv@S<CN(BYq54(OToI<?!?j
zr3~J`699nLnlJ99qivE9MbR{FlcW-~t%RSe6bow7%V{VDV+_t(Y?4%Z<9S?bjZz8`
zgQ!P@+1IfeK*i%ePJ|FV-ENnYvr(nFL<HyDG%g}^IvuXA|4^29)7Gw4s}HMx*H2tm
TC9&>T00000NkvXXu0mjfsioTU

literal 0
HcmV?d00001

diff --git a/include/GameScreens.hpp b/include/GameScreens.hpp
index 76324bc..cb6816c 100644
--- a/include/GameScreens.hpp
+++ b/include/GameScreens.hpp
@@ -25,7 +25,6 @@
 // Create the various screens
 // These may be called multiple times
 IScreenPtr makeEditorScreen(IMapPtr aMap);
-IScreenPtr makeEditorScreen(const string& aMapName);
 IScreenPtr makeGameScreen(IMapPtr aMap);
 IScreenPtr makeUIDemo();
 
diff --git a/include/gui/FromBottom.hpp b/include/gui/FromBottom.hpp
new file mode 100644
index 0000000..ff8acef
--- /dev/null
+++ b/include/gui/FromBottom.hpp
@@ -0,0 +1,38 @@
+//
+//  Copyright (C) 2009  Nick Gasson
+//
+//  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
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INC_FROM_BOTTOM_HPP
+#define INC_FROM_BOTTOM_HPP
+
+#include "Platform.hpp"
+#include "gui/ContainerWidget.hpp"
+
+namespace gui {
+
+   // A special container widget which positions its children
+   // relative to the lower edge of its parent
+   class FromBottom : public ContainerWidget {
+   public:
+      FromBottom(const AttributeSet& attrs);
+
+      void render(RenderContext& rc) const;
+   private:
+      int offset;
+   };
+}
+
+#endif
diff --git a/include/gui/ILayout.hpp b/include/gui/ILayout.hpp
index da49a68..d467d02 100644
--- a/include/gui/ILayout.hpp
+++ b/include/gui/ILayout.hpp
@@ -46,7 +46,8 @@ namespace gui {
    typedef shared_ptr<ILayout> ILayoutPtr;
 
    ILayoutPtr makeLayout(const string& file_name);
-
+   string parentPath(const string& path);
+   
 }
 
 #endif
diff --git a/layouts/editor.xml b/layouts/editor.xml
index 84818a0..c5f18f0 100644
--- a/layouts/editor.xml
+++ b/layouts/editor.xml
@@ -38,4 +38,15 @@
     <label name="bld_name" x="5" y="165" text="title"
            font="small-font"/>
   </window>
+
+  <fromBottom offset="45" name="lower">
+    <window x="10" y="0" width="110" height="40"
+            name="action_wnd">
+      <label text="Actions"
+             name="action_label"
+             x="5" y="5"/>
+      <imageButton name="save" x="70" y="5" width="32" height="32"
+                   image="images/icons/save.png"/>
+    </window>
+  </fromBottom>
 </layout>
diff --git a/schemas/layout.xsd b/schemas/layout.xsd
index 7a688a4..808ea93 100644
--- a/schemas/layout.xsd
+++ b/schemas/layout.xsd
@@ -30,6 +30,7 @@
       <xs:element name="toggleBar" type="toggleBarType"/>
       <xs:element name="canvas3d" type="canvas3dType"/>
       <xs:element name="imageButton" type="imageButtonType"/>
+      <xs:element name="fromBottom" type="fromBottomType"/>
     </xs:choice>
   </xs:group>
 
@@ -53,6 +54,17 @@
     </xs:complexContent>
   </xs:complexType>
 
+  <!-- Alignment container relative to bottom of parent -->
+  <xs:complexType name="fromBottomType">
+    <xs:complexContent>
+      <xs:extension base="widgetType">
+        <xs:group ref="widgetGroup"
+                  minOccurs="0" maxOccurs="unbounded"/>
+        <xs:attribute name="offset" type="xs:integer"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <!-- Text labels -->
   <xs:complexType name="labelType">
     <xs:complexContent>
diff --git a/src/Editor.cpp b/src/Editor.cpp
index cb16cc2..3542349 100644
--- a/src/Editor.cpp
+++ b/src/Editor.cpp
@@ -68,6 +68,7 @@ private:
                    const Point<int>& aSecondPoint) const;
    void dragBoxBounds(int& xMin, int& xMax, int &yMin, int& yMax) const;
    void deleteObjects();
+   void save();
       
    IMapPtr map;
    
@@ -94,11 +95,9 @@ Editor::Editor(IMapPtr aMap)
 
    buildGUI();
 
-   if (map) {
-      map->setGrid(true);
-
-      log() << "Editing " << aMap->name();
-   }
+   map->setGrid(true);
+   
+   log() << "Editing " << aMap->name();
 }
 
 Editor::~Editor()
@@ -129,6 +128,9 @@ void Editor::buildGUI()
    layout->get("/tool_wnd/tools/building").connect(gui::Widget::SIG_CLICK,
       bind(&Editor::setTool, this, BUILDING_TOOL));
 
+   layout->get("/lower/action_wnd/save").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::save, this));
+   
    buildingPicker = makeBuildingPicker(layout);
 }
 
@@ -138,6 +140,11 @@ void Editor::setMap(IMapPtr aMap)
    map->setGrid(true);
 }
 
+void Editor::save()
+{
+   map->save();
+}
+
 // Calculate the bounds of the drag box accounting for the different
 // possible directions of dragging
 void Editor::dragBoxBounds(int& xMin, int& xMax, int &yMin, int& yMax) const
@@ -564,14 +571,3 @@ IScreenPtr makeEditorScreen(IMapPtr aMap)
 {
    return IScreenPtr(new Editor(aMap));
 }
-
-IScreenPtr makeEditorScreen(const string& aMapName)
-{
-   using namespace placeholders;
-   
-   //Editor* editor = new Editor(IMapPtr());
-   
-   //showNewMapDialog(bind(&newMapDialogCallback, editor, _1, _2));
-   
-   return IScreenPtr();
-}
diff --git a/src/Main.cpp b/src/Main.cpp
index 6044b77..755bfb2 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -73,7 +73,7 @@ int main(int argc, char** argv)
          if (resourceExists(mapFile, "maps"))
             screen = makeEditorScreen(loadMap(mapFile));
          else {
-            screen = makeEditorScreen(mapFile);
+            screen = makeEditorScreen(makeEmptyMap(mapFile, 32, 32));
          }
       }
       else if (cmd == "play") {
diff --git a/src/gui/FromBottom.cpp b/src/gui/FromBottom.cpp
new file mode 100644
index 0000000..9870888
--- /dev/null
+++ b/src/gui/FromBottom.cpp
@@ -0,0 +1,45 @@
+//
+//  Copyright (C) 2009  Nick Gasson
+//
+//  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
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include "gui/FromBottom.hpp"
+#include "GameScreens.hpp"
+
+using namespace gui;
+
+FromBottom::FromBottom(const AttributeSet& attrs)
+   : ContainerWidget(attrs),
+     offset(attrs.get<int>("offset"))
+{
+   // It would be nice if this worked inside other widgets
+   int sh = getGameWindow()->height();
+   int sw = getGameWindow()->width();
+
+   x(0);
+   width(sw);
+   height(offset);
+   y(sh - offset);
+
+   dumpLocation();
+}
+
+void FromBottom::render(RenderContext& rc) const
+{
+   rc.pushOrigin(this);
+   ContainerWidget::render(rc);
+   rc.popOrigin();
+}
+
diff --git a/src/gui/Layout.cpp b/src/gui/Layout.cpp
index 9ee54f7..8e12237 100644
--- a/src/gui/Layout.cpp
+++ b/src/gui/Layout.cpp
@@ -29,6 +29,7 @@
 #include "gui/ToggleButton.hpp"
 #include "gui/Canvas3D.hpp"
 #include "gui/ImageButton.hpp"
+#include "gui/FromBottom.hpp"
 
 #include <vector>
 #include <sstream>
@@ -132,6 +133,8 @@ void Layout::startElement(const string& localName,
       w = new Canvas3D(attrs);
    else if (localName == "imageButton")
       w = new ImageButton(attrs);
+   else if (localName == "fromBottom")
+      w = new FromBottom(attrs);
    else
       throw runtime_error("Unexpected " + localName);
 
@@ -208,3 +211,9 @@ ILayoutPtr gui::makeLayout(const string& file_name)
 {
    return ILayoutPtr(new Layout(file_name));
 }
+
+string gui::parentPath(const string& path)
+{
+   size_t lastSlash = path.find_last_of("/");
+   return path.substr(lastSlash + 1);
+}
diff --git a/src/gui/RenderContext.cpp b/src/gui/RenderContext.cpp
index be6c186..f34c160 100644
--- a/src/gui/RenderContext.cpp
+++ b/src/gui/RenderContext.cpp
@@ -139,11 +139,14 @@ void RenderContext::scissor(Widget* w)
    offset(x, y);
 
    y = wh - y - w->height() - 1;
+
+   x = max(x, 0);
+   y = max(y, 0);
    
    int width = min(w->width() + 1, max_w);
    int height = min(w->height(), max_h);
 
-   if (x < 0 || y < 0 || width <= 0 || height <= 0) {
+   if (width <= 0 || height <= 0) {
       static bool haveWarned = false;
 
       if (!haveWarned) {
-- 
2.39.2