Readded layer menu and fixed color picker button
This commit is contained in:
parent
267a66dd32
commit
516f48993e
7 changed files with 586 additions and 522 deletions
|
|
@ -44,7 +44,7 @@ NetworkingObjects::NetObjTemporaryPtr<BookmarkListItem> BookmarkManager::get_boo
|
|||
return toRet;
|
||||
}
|
||||
|
||||
void BookmarkManager::setup_list_gui(const char* id) {
|
||||
void BookmarkManager::setup_list_gui() {
|
||||
using namespace NetworkingObjects;
|
||||
using namespace GUIStuff;
|
||||
using namespace ElementHelpers;
|
||||
|
|
@ -439,6 +439,7 @@ NetworkingObjects::NetObjOrderedListIterator<BookmarkListItem> BookmarkManager::
|
|||
auto& it = insertedBookmarkPair.second;
|
||||
world.undo.push(std::make_unique<AddBookmarkWorldUndoAction>(it->pos, world.undo.get_undoid_from_netid(insertedBookmarkPair.first), world.undo.get_undoid_from_netid(it->obj.get_net_id())));
|
||||
world.main.g.gui.set_to_layout();
|
||||
refresh_gui_data();
|
||||
return it;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class BookmarkManager {
|
|||
BookmarkManager(World& w);
|
||||
void server_init_no_file();
|
||||
void scale_up(const WorldScalar& scaleUpAmount);
|
||||
void setup_list_gui(const char* id);
|
||||
void setup_list_gui();
|
||||
void refresh_gui_data();
|
||||
void save_file(cereal::PortableBinaryOutputArchive& a) const;
|
||||
void load_file(cereal::PortableBinaryInputArchive& a, VersionNumber version);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue