[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3747 - trunk/pingus/src/worldmap
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3747 - trunk/pingus/src/worldmap |
Date: |
Tue, 8 Jul 2008 16:09:54 +0200 |
Author: grumbel
Date: 2008-07-08 16:09:53 +0200 (Tue, 08 Jul 2008)
New Revision: 3747
Modified:
trunk/pingus/src/worldmap/worldmap.cpp
trunk/pingus/src/worldmap/worldmap_screen.cpp
trunk/pingus/src/worldmap/worldmap_screen.hpp
Log:
Added some resize handling to the WorldmapScreen
Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp 2008-07-08 13:57:28 UTC (rev
3746)
+++ trunk/pingus/src/worldmap/worldmap.cpp 2008-07-08 14:09:53 UTC (rev
3747)
@@ -50,7 +50,7 @@
namespace WorldmapNS {
Worldmap* Worldmap::current_ = 0;
-
+
Worldmap::Worldmap(const std::string& arg_filename)
: filename(arg_filename),
mouse_x(0),
@@ -377,7 +377,7 @@
{
return worldmap.get_height();
}
-
+
} // namespace WorldmapNS
/* EOF */
Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp 2008-07-08 13:57:28 UTC
(rev 3746)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp 2008-07-08 14:09:53 UTC
(rev 3747)
@@ -213,15 +213,19 @@
WorldmapScreen::WorldmapScreen()
: levelname_bg("core/worldmap/levelname_bg"),
is_init(false),
- exit_worldmap(false)
+ exit_worldmap(false),
+ close_button(0),
+ story_button(0),
+ credits_button(0),
+ enter_button(0)
{
// FIXME: a bit ugly because of the proteced member, but should work
// FIXME: well enough. GUIScreen could also use multi-inheritage,
// FIXME: but that could lead to member function name conflicts
gui_manager->add(new WorldmapComponent(this));
- gui_manager->add(new WorldmapScreenCloseButton(this));
- gui_manager->add(new WorldmapScreenEnterButton(this));
- gui_manager->add(new WorldmapScreenStoryButton(this));
+ gui_manager->add(close_button = new WorldmapScreenCloseButton(this));
+ gui_manager->add(enter_button = new WorldmapScreenEnterButton(this));
+ gui_manager->add(story_button = new WorldmapScreenStoryButton(this));
}
WorldmapScreen::~WorldmapScreen ()
@@ -306,6 +310,14 @@
{
ScreenManager::instance()->push_screen(new
StoryScreen(worldmap->get_worldmap().get_end_story()));
}
+
+void
+WorldmapScreen::resize(const Size& size)
+{
+ close_button->set_pos(0, size.height - 37);
+ story_button->set_pos(0, 0);
+ enter_button->set_pos(size.width - 119, size.height - 37);
+}
} // namespace WorldmapNS
Modified: trunk/pingus/src/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.hpp 2008-07-08 13:57:28 UTC
(rev 3746)
+++ trunk/pingus/src/worldmap/worldmap_screen.hpp 2008-07-08 14:09:53 UTC
(rev 3747)
@@ -23,6 +23,10 @@
#include "../gui/gui_manager.hpp"
#include "../screen/gui_screen.hpp"
+namespace GUI {
+class SurfaceButton;
+}
+
class SceneContext;
namespace WorldmapNS {
@@ -44,6 +48,11 @@
std::auto_ptr<Worldmap> worldmap;
std::auto_ptr<Worldmap> new_worldmap;
+ GUI::SurfaceButton* close_button;
+ GUI::SurfaceButton* story_button;
+ GUI::SurfaceButton* credits_button;
+ GUI::SurfaceButton* enter_button;
+
public:
WorldmapScreen ();
~WorldmapScreen ();
@@ -72,6 +81,8 @@
void show_intro_story();
void show_end_story();
+
+ void resize(const Size& size);
private:
/** Startup Hook of the Screen */
void on_startup ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3747 - trunk/pingus/src/worldmap,
grumbel at BerliOS <=