Make connecting client GUI, and added warning when no layers are selected
This commit is contained in:
parent
e760834592
commit
777b6540db
3 changed files with 150 additions and 99 deletions
231
src/Toolbar.cpp
231
src/Toolbar.cpp
|
|
@ -371,7 +371,8 @@ void Toolbar::update() {
|
||||||
}
|
}
|
||||||
}) {
|
}) {
|
||||||
top_toolbar();
|
top_toolbar();
|
||||||
drawing_program_gui();
|
if(!main.world->clientStillConnecting)
|
||||||
|
drawing_program_gui();
|
||||||
if(viewWebVersionWelcome)
|
if(viewWebVersionWelcome)
|
||||||
web_version_welcome();
|
web_version_welcome();
|
||||||
#ifndef __EMSCRIPTEN__
|
#ifndef __EMSCRIPTEN__
|
||||||
|
|
@ -382,25 +383,33 @@ void Toolbar::update() {
|
||||||
file_picker_gui();
|
file_picker_gui();
|
||||||
else if(optionsMenuOpen)
|
else if(optionsMenuOpen)
|
||||||
options_menu();
|
options_menu();
|
||||||
|
else if(main.world->clientStillConnecting)
|
||||||
|
still_connecting_center_message();
|
||||||
else if(playerMenuOpen)
|
else if(playerMenuOpen)
|
||||||
player_list();
|
player_list();
|
||||||
|
else if(!main.world->drawProg.layerMan.is_a_layer_being_edited())
|
||||||
|
no_layers_being_edited_message();
|
||||||
|
|
||||||
if(showPerformance)
|
if(showPerformance)
|
||||||
performance_metrics();
|
performance_metrics();
|
||||||
}
|
}
|
||||||
chat_box();
|
if(!main.world->clientStillConnecting)
|
||||||
|
chat_box();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(io->hoverObstructed && (io->mouse.leftClick || io->mouse.rightClick))
|
if(!main.world->clientStillConnecting) {
|
||||||
rightClickPopupLocation = std::nullopt;
|
if(io->hoverObstructed && (io->mouse.leftClick || io->mouse.rightClick))
|
||||||
|
rightClickPopupLocation = std::nullopt;
|
||||||
|
|
||||||
if(rightClickPopupLocation.has_value()) {
|
if(rightClickPopupLocation.has_value()) {
|
||||||
if(!main.world->drawProg.right_click_popup_gui(rightClickPopupLocation.value()))
|
if(!main.world->drawProg.right_click_popup_gui(rightClickPopupLocation.value()))
|
||||||
|
rightClickPopupLocation = std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(io->hoverObstructed && io->mouse.rightClick) // This runs specifically if the paint popup has the cursor
|
||||||
rightClickPopupLocation = std::nullopt;
|
rightClickPopupLocation = std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(io->hoverObstructed && io->mouse.rightClick) // This runs specifically if the paint popup has the cursor
|
|
||||||
rightClickPopupLocation = std::nullopt;
|
|
||||||
|
|
||||||
end_gui();
|
end_gui();
|
||||||
|
|
||||||
justAssignedColorLeft = false;
|
justAssignedColorLeft = false;
|
||||||
|
|
@ -477,50 +486,52 @@ void Toolbar::top_toolbar() {
|
||||||
tabNames.emplace_back(main.worlds[i]->netObjMan.is_connected() ? "data/icons/network.svg" : "", main.worlds[i]->name);
|
tabNames.emplace_back(main.worlds[i]->netObjMan.is_connected() ? "data/icons/network.svg" : "", main.worlds[i]->name);
|
||||||
std::optional<size_t> closedTab;
|
std::optional<size_t> closedTab;
|
||||||
gui.tab_list("file tab list", tabNames, main.worldIndex, closedTab);
|
gui.tab_list("file tab list", tabNames, main.worldIndex, closedTab);
|
||||||
if(main.world->netObjMan.is_connected() && gui.svg_icon_button_transparent("Player List Toggle Button", "data/icons/list.svg", playerMenuOpen))
|
if(!main.world->clientStillConnecting) {
|
||||||
playerMenuOpen = !playerMenuOpen;
|
if(main.world->netObjMan.is_connected() && gui.svg_icon_button_transparent("Player List Toggle Button", "data/icons/list.svg", playerMenuOpen))
|
||||||
if(gui.svg_icon_button_transparent("Menu Undo Button", "data/icons/undo.svg"))
|
playerMenuOpen = !playerMenuOpen;
|
||||||
main.world->undo_with_checks();
|
if(gui.svg_icon_button_transparent("Menu Undo Button", "data/icons/undo.svg"))
|
||||||
if(gui.svg_icon_button_transparent("Menu Redo Button", "data/icons/redo.svg"))
|
main.world->undo_with_checks();
|
||||||
main.world->redo_with_checks();
|
if(gui.svg_icon_button_transparent("Menu Redo Button", "data/icons/redo.svg"))
|
||||||
if(gui.svg_icon_button_transparent("Grids Button", "data/icons/grid.svg", gridMenu.popupOpen)) {
|
main.world->redo_with_checks();
|
||||||
|
if(gui.svg_icon_button_transparent("Grids Button", "data/icons/grid.svg", gridMenu.popupOpen)) {
|
||||||
|
if(gridMenu.popupOpen)
|
||||||
|
stop_displaying_grid_menu();
|
||||||
|
else {
|
||||||
|
gridMenu.popupOpen = true;
|
||||||
|
gridMenuPopUpJustOpen = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(gui.svg_icon_button_transparent("Layer Menu Button", "data/icons/layer.svg", layerMenuPopupOpen)) {
|
||||||
|
if(layerMenuPopupOpen) {
|
||||||
|
main.world->drawProg.layerMan.listGUI.refresh_gui_data();
|
||||||
|
layerMenuPopupOpen = false;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
layerMenuPopupOpen = true;
|
||||||
|
layerMenuPopUpJustOpen = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(gui.svg_icon_button_transparent("Bookmark Menu Button", "data/icons/bookmark.svg", bookmarkMenuPopupOpen)) {
|
||||||
|
if(bookmarkMenuPopupOpen) {
|
||||||
|
main.world->bMan.refresh_gui_data();
|
||||||
|
bookmarkMenuPopupOpen = false;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
bookmarkMenuPopupOpen = true;
|
||||||
|
bookmarkMenuPopUpJustOpen = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(closedTab)
|
||||||
|
main.set_tab_to_close(closedTab.value());
|
||||||
if(gridMenu.popupOpen)
|
if(gridMenu.popupOpen)
|
||||||
stop_displaying_grid_menu();
|
grid_menu(gridMenuPopUpJustOpen);
|
||||||
else {
|
if(bookmarkMenuPopupOpen)
|
||||||
gridMenu.popupOpen = true;
|
bookmark_menu(bookmarkMenuPopUpJustOpen);
|
||||||
gridMenuPopUpJustOpen = true;
|
if(layerMenuPopupOpen)
|
||||||
}
|
layer_menu(layerMenuPopUpJustOpen);
|
||||||
}
|
}
|
||||||
if(gui.svg_icon_button_transparent("Layer Menu Button", "data/icons/layer.svg", layerMenuPopupOpen)) {
|
|
||||||
if(layerMenuPopupOpen) {
|
|
||||||
main.world->drawProg.layerMan.listGUI.refresh_gui_data();
|
|
||||||
layerMenuPopupOpen = false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
layerMenuPopupOpen = true;
|
|
||||||
layerMenuPopUpJustOpen = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(gui.svg_icon_button_transparent("Bookmark Menu Button", "data/icons/bookmark.svg", bookmarkMenuPopupOpen)) {
|
|
||||||
if(bookmarkMenuPopupOpen) {
|
|
||||||
main.world->bMan.refresh_gui_data();
|
|
||||||
bookmarkMenuPopupOpen = false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
bookmarkMenuPopupOpen = true;
|
|
||||||
bookmarkMenuPopUpJustOpen = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if(closedTab)
|
|
||||||
main.set_tab_to_close(closedTab.value());
|
|
||||||
if(gridMenu.popupOpen)
|
|
||||||
grid_menu(gridMenuPopUpJustOpen);
|
|
||||||
if(bookmarkMenuPopupOpen)
|
|
||||||
bookmark_menu(bookmarkMenuPopUpJustOpen);
|
|
||||||
if(layerMenuPopupOpen)
|
|
||||||
layer_menu(layerMenuPopUpJustOpen);
|
|
||||||
if(menuPopUpOpen) {
|
if(menuPopUpOpen) {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
|
|
@ -540,58 +551,60 @@ void Toolbar::top_toolbar() {
|
||||||
.isClient = false
|
.isClient = false
|
||||||
}, true);
|
}, true);
|
||||||
}
|
}
|
||||||
if(gui.text_button_left_transparent("save file", "Save"))
|
|
||||||
save_func();
|
|
||||||
if(gui.text_button_left_transparent("save as file", "Save As"))
|
|
||||||
save_as_func();
|
|
||||||
if(gui.text_button_left_transparent("open file", "Open"))
|
if(gui.text_button_left_transparent("open file", "Open"))
|
||||||
open_world_file(false, "", "");
|
open_world_file(false, "", "");
|
||||||
if(gui.text_button_left_transparent("screenshot", "Take Screenshot"))
|
if(!main.world->clientStillConnecting) {
|
||||||
main.world->drawProg.switch_to_tool(DrawingProgramToolType::SCREENSHOT);
|
if(gui.text_button_left_transparent("save file", "Save"))
|
||||||
if(gui.text_button_left_transparent("add image or file to canvas", "Add Image/File to Canvas")) {
|
save_func();
|
||||||
#ifdef __EMSCRIPTEN__
|
if(gui.text_button_left_transparent("save as file", "Save As"))
|
||||||
static std::weak_ptr<World> worldWeakPtr;
|
save_as_func();
|
||||||
worldWeakPtr = make_weak_ptr(main.world);
|
if(gui.text_button_left_transparent("screenshot", "Take Screenshot"))
|
||||||
emscripten_browser_file::upload("*", [](std::string const& fileName, std::string const& mimeType, std::string_view buffer, void* callbackData) {
|
main.world->drawProg.switch_to_tool(DrawingProgramToolType::SCREENSHOT);
|
||||||
if(!buffer.empty()) {
|
if(gui.text_button_left_transparent("add image or file to canvas", "Add Image/File to Canvas")) {
|
||||||
auto world = ((std::weak_ptr<World>*)callbackData)->lock();
|
#ifdef __EMSCRIPTEN__
|
||||||
if(world)
|
static std::weak_ptr<World> worldWeakPtr;
|
||||||
world->drawProg.add_file_to_canvas_by_data(fileName, buffer, world->main.window.size.cast<float>() / 2.0f);
|
worldWeakPtr = make_weak_ptr(main.world);
|
||||||
|
emscripten_browser_file::upload("*", [](std::string const& fileName, std::string const& mimeType, std::string_view buffer, void* callbackData) {
|
||||||
|
if(!buffer.empty()) {
|
||||||
|
auto world = ((std::weak_ptr<World>*)callbackData)->lock();
|
||||||
|
if(world)
|
||||||
|
world->drawProg.add_file_to_canvas_by_data(fileName, buffer, world->main.window.size.cast<float>() / 2.0f);
|
||||||
|
else
|
||||||
|
Logger::get().log("INFO", "Loading image to canvas that has been destroyed");
|
||||||
|
}
|
||||||
|
}, &worldWeakPtr);
|
||||||
|
#else
|
||||||
|
open_file_selector("Open File", {{"Any File", "*"}}, [w = make_weak_ptr(main.world)](const std::filesystem::path& p, const auto& e) {
|
||||||
|
auto wLock = w.lock();
|
||||||
|
if(wLock)
|
||||||
|
wLock->drawProg.add_file_to_canvas_by_path(p.string(), wLock->main.window.size.cast<float>() / 2.0f, false);
|
||||||
else
|
else
|
||||||
Logger::get().log("INFO", "Loading image to canvas that has been destroyed");
|
Logger::get().log("INFO", "Loading image to canvas that has been destroyed");
|
||||||
}
|
});
|
||||||
}, &worldWeakPtr);
|
#endif
|
||||||
#else
|
}
|
||||||
open_file_selector("Open File", {{"Any File", "*"}}, [w = make_weak_ptr(main.world)](const std::filesystem::path& p, const auto& e) {
|
if(main.world->netObjMan.is_connected()) {
|
||||||
auto wLock = w.lock();
|
if(gui.text_button_left_transparent("lobby info", "Lobby Info")) {
|
||||||
if(wLock)
|
optionsMenuOpen = true;
|
||||||
wLock->drawProg.add_file_to_canvas_by_path(p.string(), wLock->main.window.size.cast<float>() / 2.0f, false);
|
optionsMenuType = LOBBY_INFO_MENU;
|
||||||
else
|
}
|
||||||
Logger::get().log("INFO", "Loading image to canvas that has been destroyed");
|
}
|
||||||
});
|
else if(gui.text_button_left_transparent("start hosting", "Host")) {
|
||||||
#endif
|
serverLocalID = NetLibrary::get_random_server_local_id();
|
||||||
}
|
serverToConnectTo = NetLibrary::get_global_id() + serverLocalID;
|
||||||
if(main.world->netObjMan.is_connected()) {
|
optionsMenuOpen = true;
|
||||||
if(gui.text_button_left_transparent("lobby info", "Lobby Info")) {
|
optionsMenuType = HOST_MENU;
|
||||||
optionsMenuOpen = true;
|
}
|
||||||
optionsMenuType = LOBBY_INFO_MENU;
|
if(gui.text_button_left_transparent("canvas specific settings", "Canvas Settings")) {
|
||||||
|
optionsMenuOpen = true;
|
||||||
|
optionsMenuType = CANVAS_SETTINGS_MENU;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else if(gui.text_button_left_transparent("start hosting", "Host")) {
|
|
||||||
serverLocalID = NetLibrary::get_random_server_local_id();
|
|
||||||
serverToConnectTo = NetLibrary::get_global_id() + serverLocalID;
|
|
||||||
optionsMenuOpen = true;
|
|
||||||
optionsMenuType = HOST_MENU;
|
|
||||||
}
|
}
|
||||||
if(gui.text_button_left_transparent("start connecting", "Connect")) {
|
if(gui.text_button_left_transparent("start connecting", "Connect")) {
|
||||||
serverToConnectTo.clear();
|
serverToConnectTo.clear();
|
||||||
optionsMenuOpen = true;
|
optionsMenuOpen = true;
|
||||||
optionsMenuType = CONNECT_MENU;
|
optionsMenuType = CONNECT_MENU;
|
||||||
}
|
}
|
||||||
if(gui.text_button_left_transparent("canvas specific settings", "Canvas Settings")) {
|
|
||||||
optionsMenuOpen = true;
|
|
||||||
optionsMenuType = CANVAS_SETTINGS_MENU;
|
|
||||||
}
|
|
||||||
if(gui.text_button_left_transparent("open options", "Settings")) {
|
if(gui.text_button_left_transparent("open options", "Settings")) {
|
||||||
optionsMenuOpen = true;
|
optionsMenuOpen = true;
|
||||||
optionsMenuType = GENERAL_SETTINGS_MENU;
|
optionsMenuType = GENERAL_SETTINGS_MENU;
|
||||||
|
|
@ -643,6 +656,40 @@ If you like this app, consider downloading the native version for your system)")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Toolbar::still_connecting_center_message() {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.padding = CLAY_PADDING_ALL(io->theme->padding1),
|
||||||
|
.childGap = io->theme->childGap1,
|
||||||
|
.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),
|
||||||
|
.floating = {.attachPoints = {.element = CLAY_ATTACH_POINT_CENTER_CENTER, .parent = CLAY_ATTACH_POINT_CENTER_CENTER}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
||||||
|
}) {
|
||||||
|
gui.text_label("Connecting to server...");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Toolbar::no_layers_being_edited_message() {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.padding = CLAY_PADDING_ALL(io->theme->padding1),
|
||||||
|
.childGap = io->theme->childGap1,
|
||||||
|
.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),
|
||||||
|
.floating = {.attachPoints = {.element = CLAY_ATTACH_POINT_CENTER_CENTER, .parent = CLAY_ATTACH_POINT_CENTER_CENTER}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
||||||
|
}) {
|
||||||
|
gui.text_label("Select a layer to edit");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef __EMSCRIPTEN__
|
#ifndef __EMSCRIPTEN__
|
||||||
void Toolbar::update_notification_check() {
|
void Toolbar::update_notification_check() {
|
||||||
if(!updateCheckerData.updateCheckDone) {
|
if(!updateCheckerData.updateCheckDone) {
|
||||||
|
|
|
||||||
|
|
@ -114,6 +114,8 @@ class Toolbar {
|
||||||
void load_default_theme();
|
void load_default_theme();
|
||||||
void about_menu_gui();
|
void about_menu_gui();
|
||||||
void web_version_welcome();
|
void web_version_welcome();
|
||||||
|
void still_connecting_center_message();
|
||||||
|
void no_layers_being_edited_message();
|
||||||
|
|
||||||
#ifndef __EMSCRIPTEN__
|
#ifndef __EMSCRIPTEN__
|
||||||
void update_notification_gui();
|
void update_notification_gui();
|
||||||
|
|
|
||||||
|
|
@ -548,12 +548,14 @@ void World::list_debug_test_update() {
|
||||||
|
|
||||||
void World::draw(SkCanvas* canvas) {
|
void World::draw(SkCanvas* canvas) {
|
||||||
drawData.refresh_draw_optimizing_values();
|
drawData.refresh_draw_optimizing_values();
|
||||||
if(drawData.drawGrids)
|
if(!clientStillConnecting) {
|
||||||
gridMan.draw_back(canvas, drawData);
|
if(drawData.drawGrids)
|
||||||
drawProg.draw(canvas, drawData);
|
gridMan.draw_back(canvas, drawData);
|
||||||
if(drawData.drawGrids) {
|
drawProg.draw(canvas, drawData);
|
||||||
gridMan.draw_front(canvas, drawData);
|
if(drawData.drawGrids) {
|
||||||
gridMan.draw_coordinates(canvas, drawData);
|
gridMan.draw_front(canvas, drawData);
|
||||||
|
gridMan.draw_coordinates(canvas, drawData);
|
||||||
|
}
|
||||||
|
draw_other_player_cursors(canvas, drawData);
|
||||||
}
|
}
|
||||||
draw_other_player_cursors(canvas, drawData);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue