Client now automatically selects a layer when connected
This commit is contained in:
parent
ebe4d8e60a
commit
108da82fd4
5 changed files with 96 additions and 75 deletions
|
|
@ -33,3 +33,19 @@ void DrawingProgramLayerFolder::get_flattened_component_list(std::vector<CanvasC
|
||||||
for(auto& listItem : (*folderList) | std::views::reverse)
|
for(auto& listItem : (*folderList) | std::views::reverse)
|
||||||
listItem.obj->get_flattened_component_list(objList);
|
listItem.obj->get_flattened_component_list(objList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> DrawingProgramLayerFolder::get_initial_editing_layer() const {
|
||||||
|
// BFS, select a layer that's closest to root as possible
|
||||||
|
for(auto& c : *folderList) {
|
||||||
|
if(!c.obj->is_folder())
|
||||||
|
return c.obj;
|
||||||
|
}
|
||||||
|
for(auto& c : *folderList) {
|
||||||
|
if(c.obj->is_folder()) {
|
||||||
|
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> toRet = c.obj->get_folder().get_initial_editing_layer();
|
||||||
|
if(!toRet.expired())
|
||||||
|
return toRet;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ class DrawingProgramLayerFolder {
|
||||||
void commit_update_dont_invalidate_cache(DrawingProgramLayerManager& layerMan) const;
|
void commit_update_dont_invalidate_cache(DrawingProgramLayerManager& layerMan) const;
|
||||||
void get_flattened_component_list(std::vector<CanvasComponentContainer::ObjInfo*>& objList) const;
|
void get_flattened_component_list(std::vector<CanvasComponentContainer::ObjInfo*>& objList) const;
|
||||||
void set_to_erase();
|
void set_to_erase();
|
||||||
|
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> get_initial_editing_layer() const;
|
||||||
|
|
||||||
NetworkingObjects::NetObjOwnerPtr<NetworkingObjects::NetObjOrderedList<DrawingProgramLayerListItem>> folderList;
|
NetworkingObjects::NetObjOwnerPtr<NetworkingObjects::NetObjOrderedList<DrawingProgramLayerListItem>> folderList;
|
||||||
bool isFolderOpen = false;
|
bool isFolderOpen = false;
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ void DrawingProgramLayerManager::read_components_client(cereal::PortableBinaryIn
|
||||||
layerTreeRoot = drawP.world.netObjMan.read_create_message<DrawingProgramLayerListItem>(a, nullptr);
|
layerTreeRoot = drawP.world.netObjMan.read_create_message<DrawingProgramLayerListItem>(a, nullptr);
|
||||||
layerTreeRoot->commit_update_dont_invalidate_cache(*this);
|
layerTreeRoot->commit_update_dont_invalidate_cache(*this);
|
||||||
layerTreeRoot->set_component_list_callbacks(*this);
|
layerTreeRoot->set_component_list_callbacks(*this);
|
||||||
|
editingLayer = layerTreeRoot->get_folder().get_initial_editing_layer();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DrawingProgramLayerManager::is_a_layer_being_edited() {
|
bool DrawingProgramLayerManager::is_a_layer_being_edited() {
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ class DrawingProgramLayerManager {
|
||||||
friend class DrawingProgramLayerFolder;
|
friend class DrawingProgramLayerFolder;
|
||||||
NetworkingObjects::NetObjOwnerPtr<DrawingProgramLayerListItem> layerTreeRoot;
|
NetworkingObjects::NetObjOwnerPtr<DrawingProgramLayerListItem> layerTreeRoot;
|
||||||
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> editingLayer;
|
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> editingLayer;
|
||||||
|
void set_initial_editing_layer();
|
||||||
public:
|
public:
|
||||||
enum class LayerSelector {
|
enum class LayerSelector {
|
||||||
ALL_VISIBLE_LAYERS,
|
ALL_VISIBLE_LAYERS,
|
||||||
|
|
|
||||||
152
src/Toolbar.cpp
152
src/Toolbar.cpp
|
|
@ -703,90 +703,92 @@ void Toolbar::update_notification_gui() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void Toolbar::grid_menu(bool justOpened) {
|
void Toolbar::grid_menu(bool justOpened) {
|
||||||
gui.push_id("grid menu");
|
if(main.world->gridMan.grids) {
|
||||||
CLAY_AUTO_ID({
|
gui.push_id("grid menu");
|
||||||
.layout = {
|
CLAY_AUTO_ID({
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(300), .height = CLAY_SIZING_FIT(0, 600) },
|
.layout = {
|
||||||
.padding = CLAY_PADDING_ALL(io->theme->padding1),
|
.sizing = {.width = CLAY_SIZING_FIT(300), .height = CLAY_SIZING_FIT(0, 600) },
|
||||||
.childGap = io->theme->childGap1,
|
.padding = CLAY_PADDING_ALL(io->theme->padding1),
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP},
|
.childGap = io->theme->childGap1,
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP},
|
||||||
},
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(io->theme->backColor1),
|
},
|
||||||
.cornerRadius = CLAY_CORNER_RADIUS(io->theme->windowCorners1),
|
.backgroundColor = convert_vec4<Clay_Color>(io->theme->backColor1),
|
||||||
.floating = {.offset = {.x = 0, .y = static_cast<float>(io->theme->padding1)}, .attachPoints = {.element = CLAY_ATTACH_POINT_RIGHT_TOP, .parent = CLAY_ATTACH_POINT_RIGHT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
.cornerRadius = CLAY_CORNER_RADIUS(io->theme->windowCorners1),
|
||||||
}) {
|
.floating = {.offset = {.x = 0, .y = static_cast<float>(io->theme->padding1)}, .attachPoints = {.element = CLAY_ATTACH_POINT_RIGHT_TOP, .parent = CLAY_ATTACH_POINT_RIGHT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
||||||
gui.obstructing_window();
|
}) {
|
||||||
gui.text_label_centered("Grids");
|
gui.obstructing_window();
|
||||||
float entryHeight = 25.0f;
|
gui.text_label_centered("Grids");
|
||||||
if(main.world->gridMan.grids->empty())
|
float entryHeight = 25.0f;
|
||||||
gui.text_label_centered("No grids yet...");
|
if(main.world->gridMan.grids->empty())
|
||||||
uint32_t toDelete = std::numeric_limits<uint32_t>::max();
|
gui.text_label_centered("No grids yet...");
|
||||||
gui.scroll_bar_many_entries_area("grid menu entries", entryHeight, main.world->gridMan.grids->size(), true, [&](size_t i, bool isListHovered) {
|
uint32_t toDelete = std::numeric_limits<uint32_t>::max();
|
||||||
auto& grid = main.world->gridMan.grids->at(i)->obj;
|
gui.scroll_bar_many_entries_area("grid menu entries", entryHeight, main.world->gridMan.grids->size(), true, [&](size_t i, bool isListHovered) {
|
||||||
bool selectedEntry = gridMenu.selectedGrid == i;
|
auto& grid = main.world->gridMan.grids->at(i)->obj;
|
||||||
CLAY_AUTO_ID({
|
bool selectedEntry = gridMenu.selectedGrid == i;
|
||||||
.layout = {
|
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(entryHeight)},
|
|
||||||
.childGap = 2,
|
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER},
|
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
|
||||||
},
|
|
||||||
.backgroundColor = selectedEntry ? convert_vec4<Clay_Color>(io->theme->backColor1) : convert_vec4<Clay_Color>(io->theme->backColor2)
|
|
||||||
}) {
|
|
||||||
gui.text_label(grid->get_display_name());
|
|
||||||
bool miniButtonClicked = false;
|
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(entryHeight)},
|
||||||
.childGap = 1,
|
.childGap = 2,
|
||||||
.childAlignment = {.x = CLAY_ALIGN_X_RIGHT, .y = CLAY_ALIGN_Y_CENTER},
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER},
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
}
|
},
|
||||||
|
.backgroundColor = selectedEntry ? convert_vec4<Clay_Color>(io->theme->backColor1) : convert_vec4<Clay_Color>(io->theme->backColor2)
|
||||||
}) {
|
}) {
|
||||||
if(gui.svg_icon_button_transparent("visibility eye", grid->visible ? "data/icons/eyeopen.svg" : "data/icons/eyeclose.svg", false, entryHeight, false)) {
|
gui.text_label(grid->get_display_name());
|
||||||
miniButtonClicked = true;
|
bool miniButtonClicked = false;
|
||||||
grid->visible = !grid->visible;
|
CLAY_AUTO_ID({
|
||||||
NetworkingObjects::generic_serialized_class_send_update_to_all<WorldGrid>(grid);
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||||
|
.childGap = 1,
|
||||||
|
.childAlignment = {.x = CLAY_ALIGN_X_RIGHT, .y = CLAY_ALIGN_Y_CENTER},
|
||||||
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
if(gui.svg_icon_button_transparent("visibility eye", grid->visible ? "data/icons/eyeopen.svg" : "data/icons/eyeclose.svg", false, entryHeight, false)) {
|
||||||
|
miniButtonClicked = true;
|
||||||
|
grid->visible = !grid->visible;
|
||||||
|
NetworkingObjects::generic_serialized_class_send_update_to_all<WorldGrid>(grid);
|
||||||
|
}
|
||||||
|
if(gui.svg_icon_button_transparent("edit pencil", "data/icons/pencil.svg", false, entryHeight, false)) {
|
||||||
|
miniButtonClicked = true;
|
||||||
|
main.world->drawProg.modify_grid(grid);
|
||||||
|
stop_displaying_grid_menu();
|
||||||
|
}
|
||||||
|
if(gui.svg_icon_button_transparent("delete trash", "data/icons/trash.svg", false, entryHeight, false)) {
|
||||||
|
miniButtonClicked = true;
|
||||||
|
toDelete = i;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(gui.svg_icon_button_transparent("edit pencil", "data/icons/pencil.svg", false, entryHeight, false)) {
|
if(Clay_Hovered() && io->mouse.leftClick && isListHovered && !miniButtonClicked) {
|
||||||
miniButtonClicked = true;
|
gridMenu.selectedGrid = i;
|
||||||
main.world->drawProg.modify_grid(grid);
|
if(io->mouse.leftClick >= 2) {
|
||||||
stop_displaying_grid_menu();
|
main.world->drawProg.modify_grid(grid);
|
||||||
}
|
stop_displaying_grid_menu();
|
||||||
if(gui.svg_icon_button_transparent("delete trash", "data/icons/trash.svg", false, entryHeight, false)) {
|
}
|
||||||
miniButtonClicked = true;
|
|
||||||
toDelete = i;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(Clay_Hovered() && io->mouse.leftClick && isListHovered && !miniButtonClicked) {
|
|
||||||
gridMenu.selectedGrid = i;
|
|
||||||
if(io->mouse.leftClick >= 2) {
|
|
||||||
main.world->drawProg.modify_grid(grid);
|
|
||||||
stop_displaying_grid_menu();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if(toDelete != std::numeric_limits<uint32_t>::max())
|
|
||||||
main.world->gridMan.remove_grid(toDelete);
|
|
||||||
gui.left_to_right_line_layout([&]() {
|
|
||||||
bool addByEnter = false;
|
|
||||||
gui.input_text("grid text input", &gridMenu.newName, true, [&](GUIStuff::SelectionHelper& s) {
|
|
||||||
addByEnter = s.selected && io->key.enter;
|
|
||||||
});
|
});
|
||||||
if(gui.svg_icon_button("grid add button", "data/icons/plusbold.svg", false, GUIStuff::GUIManager::SMALL_BUTTON_SIZE) || (addByEnter && !gridMenu.newName.empty())) {
|
if(toDelete != std::numeric_limits<uint32_t>::max())
|
||||||
main.world->gridMan.add_default_grid(gridMenu.newName);
|
main.world->gridMan.remove_grid(toDelete);
|
||||||
main.world->drawProg.modify_grid(main.world->gridMan.grids->at(main.world->gridMan.grids->size() - 1)->obj);
|
gui.left_to_right_line_layout([&]() {
|
||||||
stop_displaying_grid_menu();
|
bool addByEnter = false;
|
||||||
}
|
gui.input_text("grid text input", &gridMenu.newName, true, [&](GUIStuff::SelectionHelper& s) {
|
||||||
});
|
addByEnter = s.selected && io->key.enter;
|
||||||
|
});
|
||||||
|
if(gui.svg_icon_button("grid add button", "data/icons/plusbold.svg", false, GUIStuff::GUIManager::SMALL_BUTTON_SIZE) || (addByEnter && !gridMenu.newName.empty())) {
|
||||||
|
main.world->gridMan.add_default_grid(gridMenu.newName);
|
||||||
|
main.world->drawProg.modify_grid(main.world->gridMan.grids->at(main.world->gridMan.grids->size() - 1)->obj);
|
||||||
|
stop_displaying_grid_menu();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
bool dropdownHover = false;
|
bool dropdownHover = false;
|
||||||
if(io->mouse.leftClick && !Clay_Hovered() && !justOpened && !dropdownHover)
|
if(io->mouse.leftClick && !Clay_Hovered() && !justOpened && !dropdownHover)
|
||||||
stop_displaying_grid_menu();
|
stop_displaying_grid_menu();
|
||||||
|
}
|
||||||
|
gui.pop_id();
|
||||||
}
|
}
|
||||||
gui.pop_id();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toolbar::stop_displaying_grid_menu() {
|
void Toolbar::stop_displaying_grid_menu() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue