[Wesnoth-commits] r28231 - in /trunk/src: editor2/editor_controller.cpp editor2/editor_controller.hpp mouse_handler_base.cpp

[kailoran]

Author: ilor
Date: Sat Jul 26 22:48:51 2008
New Revision: 28231

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28231&view=rev
Log:
editor2: display starting position labels

Modified:
    trunk/src/editor2/editor_controller.cpp
    trunk/src/editor2/editor_controller.hpp
    trunk/src/mouse_handler_base.cpp

Modified: trunk/src/editor2/editor_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/editor_controller.cpp?rev=28231&r1=28230&r2=28231&view=diff
==============================================================================
--- trunk/src/editor2/editor_controller.cpp (original)
+++ trunk/src/editor2/editor_controller.cpp Sat Jul 26 22:48:51 2008
@@ -26,6 +26,7 @@
 #include "../cursor.hpp"
 #include "../filechooser.hpp"
 #include "../filesystem.hpp"
+#include "../font.hpp"
 #include "../foreach.hpp"
 #include "../gettext.hpp"
 #include "../hotkeys.hpp"
@@ -45,6 +46,7 @@
 , current_brush_index_(0)
 {
        init(video);
+       floating_label_manager_ = new font::floating_label_context();
        size_specs_ = new size_specs();
        adjust_sizes(gui(), *size_specs_);
        palette_ = new terrain_palette(gui(), *size_specs_, map_, game_config,
@@ -90,6 +92,7 @@
 {
        delete palette_;
        delete size_specs_;
+       delete floating_label_manager_;
     delete gui_;
        typedef std::pair<hotkey::HOTKEY_COMMAND, mouse_action*> apr;
        foreach (apr a, mouse_actions_) {

Modified: trunk/src/editor2/editor_controller.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/editor_controller.hpp?rev=28231&r1=28230&r2=28231&view=diff
==============================================================================
--- trunk/src/editor2/editor_controller.hpp (original)
+++ trunk/src/editor2/editor_controller.hpp Sat Jul 26 22:48:51 2008
@@ -33,6 +33,14 @@
 #include <boost/utility.hpp>
 
 class config;
+
+namespace tooltips {
+class manager;
+}
+
+namespace font {
+class floating_label_context;
+}
 
 namespace editor2 {
 
@@ -113,6 +121,8 @@
                brush_bar* brush_bar_;
                
                preferences::display_manager* prefs_disp_manager_;
+               tooltips::manager* tooltip_manager_;
+               font::floating_label_context* floating_label_manager_;
                
                bool do_quit_;
                EXIT_STATUS quit_mode_;

Modified: trunk/src/mouse_handler_base.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_handler_base.cpp?rev=28231&r1=28230&r2=28231&view=diff
==============================================================================
--- trunk/src/mouse_handler_base.cpp (original)
+++ trunk/src/mouse_handler_base.cpp Sat Jul 26 22:48:51 2008
@@ -137,6 +137,7 @@
                dragging_started_ = false;
                cursor::set_dragging(false);
                if (right_click_before_menu(event.x, event.y, browse)) {
+                       LOG_STREAM(warn, display) << "RMB context menu...\n";
                        gui().draw(); // redraw highlight (and maybe some more)
                        const theme::menu* const m = 
gui().get_theme().context_menu();
                        if (m != NULL)


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits