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

[grumbel at BerliOS]

Author: grumbel
Date: 2007-10-30 07:13:44 +0100 (Tue, 30 Oct 2007)
New Revision: 3391

Modified:
   trunk/pingus/TODO
   trunk/pingus/src/editor/editor_screen.cpp
Log:
- fixed drag&drop behind minimap

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-10-30 06:05:56 UTC (rev 3390)
+++ trunk/pingus/TODO   2007-10-30 06:13:44 UTC (rev 3391)
@@ -308,8 +308,6 @@
 
 - default entrance hotspots to 100
 
-- drag&drop is behind minimap
-
 - shrinking the editor window to much causes a crash (limit size as temporary 
fix)
 
 - implement proper tmpfile Support (save tmp levels to ~/.pingus/tmp/

Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp   2007-10-30 06:05:56 UTC (rev 
3390)
+++ trunk/pingus/src/editor/editor_screen.cpp   2007-10-30 06:13:44 UTC (rev 
3391)
@@ -68,15 +68,25 @@
   //rect(Vector2i(Display::get_width() - 244 + 2,  38 + 3 + 62),
   //      Size(240, Display::get_height() - (600 - 495))),
 
-  object_selector = new ObjectSelector(this, Rect());
-  gui_manager->add(object_selector, true);
-
   minimap = new Minimap(this, Rect());
   gui_manager->add(minimap, true);
 
   object_properties = new ObjectProperties(this, Rect(Vector2i(), Size(200, 
150)));
   gui_manager->add(object_properties, true);
 
+  action_properties = new ActionProperties(this, Rect());
+  action_properties->hide();
+  gui_manager->add(action_properties, true);
+
+  level_properties = new LevelProperties(this, Rect());
+  level_properties->hide();
+  level_properties->set_level(plf);
+  action_properties->set_level(plf);
+  gui_manager->add(level_properties, true);
+
+  object_selector = new ObjectSelector(this, Rect());
+  gui_manager->add(object_selector, true);
+
   file_load_dialog = new FileDialog(this, Rect(Vector2i(50, 50), 
                                                Size(Display::get_width() - 
100, 
                                                     Display::get_height() - 
100)), 
@@ -94,18 +104,8 @@
   gui_manager->add(file_save_dialog, true);
 
   
viewport->selection_changed.connect(boost::bind(&ObjectProperties::set_objects, 
object_properties, _1));
+  viewport->refresh();
 
-  action_properties = new ActionProperties(this, Rect());
-  action_properties->hide();
-  gui_manager->add(action_properties, true);
-
-  level_properties = new LevelProperties(this, Rect());
-  level_properties->hide();
-  level_properties->set_level(plf);
-  action_properties->set_level(plf);
-  gui_manager->add(level_properties, true);
-
-  viewport->refresh();
   update_layout();
 }