[Pingus-CVS] r3389 - in trunk/pingus: . src/editor

[grumbel at BerliOS]

Author: grumbel
Date: 2007-10-30 06:58:08 +0100 (Tue, 30 Oct 2007)
New Revision: 3389

Modified:
   trunk/pingus/TODO
   trunk/pingus/src/editor/editor_viewport.cpp
   trunk/pingus/src/editor/level_properties.cpp
Log:
- fixed viewport scroll limit not being adjusted along with levelsize

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-10-30 05:51:33 UTC (rev 3388)
+++ trunk/pingus/TODO   2007-10-30 05:58:08 UTC (rev 3389)
@@ -308,9 +308,6 @@
 
 - default entrance hotspots to 100
 
-- changing the map size in the editor does not change the view bounds 
(GraphicState.set_limits())
-  until the map is reloaded
-
 - solid color background gets 0,0 size after load
 
 - drag&drop is behind minimap

Modified: trunk/pingus/src/editor/editor_viewport.cpp
===================================================================
--- trunk/pingus/src/editor/editor_viewport.cpp 2007-10-30 05:51:33 UTC (rev 
3388)
+++ trunk/pingus/src/editor/editor_viewport.cpp 2007-10-30 05:58:08 UTC (rev 
3389)
@@ -391,9 +391,9 @@
 EditorViewport::refresh()
 {
   state.set_limit(Rect(Vector2i(0,0), 
editor->get_level()->get_size()).grow(256));
-  std::cout << editor->get_level()->get_size().width << ", "
-            << editor->get_level()->get_size().height 
-            << std::endl;
+  //std::cout << editor->get_level()->get_size().width << ", "
+  //<< editor->get_level()->get_size().height 
+  //            << std::endl;
 }
 
 void 

Modified: trunk/pingus/src/editor/level_properties.cpp
===================================================================
--- trunk/pingus/src/editor/level_properties.cpp        2007-10-30 05:51:33 UTC 
(rev 3388)
+++ trunk/pingus/src/editor/level_properties.cpp        2007-10-30 05:58:08 UTC 
(rev 3389)
@@ -24,6 +24,7 @@
 #include "inputbox.hpp"
 #include "gui_style.hpp"
 #include "editor_level.hpp"
+#include "editor_viewport.hpp"
 #include "level_properties.hpp"
 
 /*
@@ -38,8 +39,9 @@
 
 namespace Editor {
 
-LevelProperties::LevelProperties(EditorScreen* editor, const Rect& rect)
+LevelProperties::LevelProperties(EditorScreen* editor_, const Rect& rect)
   : GroupComponent(rect),
+    editor(editor_),
     level(0)
 {
   int w = rect.get_width() - 120;
@@ -141,7 +143,8 @@
 LevelProperties::on_width_change(const std::string& str)
 {
   Size s = level->get_size();
-  level->set_size(Size(StringUtil::to<int>(str), s.height));  
+  level->set_size(Size(StringUtil::to<int>(str), s.height));
+  editor->get_viewport()->refresh();
 }
 
 void