Misc WIP
This commit is contained in:
parent
6d8e44a4f0
commit
185fca8444
4 changed files with 9 additions and 1 deletions
|
@ -47,6 +47,8 @@
|
|||
[grid]
|
||||
[row]
|
||||
[column]
|
||||
border = "left,right"
|
||||
border_size = 10
|
||||
[label]
|
||||
definition = "gold"
|
||||
id = "label"
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include "floating_label.hpp"
|
||||
#include "game_board.hpp"
|
||||
#include "game_preferences.hpp"
|
||||
#include "floating_textbox.hpp"
|
||||
#include "halo.hpp"
|
||||
#include "log.hpp"
|
||||
#include "map/map.hpp"
|
||||
|
@ -284,6 +285,7 @@ void game_display::draw_invalidated()
|
|||
void game_display::post_commit()
|
||||
{
|
||||
halo_man_->render();
|
||||
textbox_info_->
|
||||
}
|
||||
|
||||
void game_display::draw_hex(const map_location& loc)
|
||||
|
|
|
@ -31,6 +31,10 @@ class game_board;
|
|||
|
||||
#include <deque>
|
||||
|
||||
namespace gui2 {
|
||||
class tfloating_textbox;
|
||||
}
|
||||
|
||||
// This needs to be separate from display.h because of the static
|
||||
// singleton member, which will otherwise trigger link failure
|
||||
// when building the editor.
|
||||
|
@ -262,6 +266,7 @@ private:
|
|||
|
||||
bool needs_rebuild_;
|
||||
|
||||
std::shared_ptr<gui2::tfloating_textbox> textbox_info_;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -134,7 +134,6 @@ private:
|
|||
|
||||
const config& game_config_;
|
||||
|
||||
std::shared_ptr<gui2::tfloating_textbox> textbox_info_;
|
||||
std::string last_search_;
|
||||
map_location last_search_hit_;
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue