Getting color selectors working

This commit is contained in:
Yousef Khadadeh 2026-04-02 18:23:36 +03:00
parent 60c12ce150
commit 2c76741c9b
8 changed files with 242 additions and 189 deletions

View file

@ -299,9 +299,15 @@ template <typename T> std::array<Vector<T, 2>, 4> triangle_from_rect_points(cons
return {min, {min.x(), max.y()}, max, {max.x(), min.y()}}; return {min, {min.x(), max.y()}, max, {max.x(), min.y()}};
} }
template <typename T> std::string vec_pretty(const Vector<T, 2>& a) { template <typename T> std::string vec_pretty(const T& a) {
std::stringstream ss; std::stringstream ss;
ss << "[" << a.x() << ", " << a.y() << "]"; ss << "[";
for(size_t i = 0; i < a.size(); i++) {
if(i == a.size() - 1)
ss << a[i] << "]";
else
ss << a[i] << ", ";
}
return ss.str(); return ss.str();
} }

View file

@ -331,6 +331,7 @@ void DrawingProgram::toolbar_gui() {
GUIManager& gui = world.main.g.gui; GUIManager& gui = world.main.g.gui;
auto& io = gui.io; auto& io = gui.io;
auto& t = world.main.toolbar;
gui.new_id("Drawing Program Toolbar GUI", [&] { gui.new_id("Drawing Program Toolbar GUI", [&] {
gui.element<LayoutElement>("Drawing Program Toolbar GUI", [&] (const Clay_ElementId& lId) { gui.element<LayoutElement>("Drawing Program Toolbar GUI", [&] (const Clay_ElementId& lId) {
@ -374,6 +375,9 @@ void DrawingProgram::toolbar_gui() {
world.drawData.cam.c.rotate_about(world.drawData.cam.c.from_space(world.main.window.size.cast<float>() * 0.5f), *newRotationAngle - world.drawData.cam.c.rotation); world.drawData.cam.c.rotate_about(world.drawData.cam.c.from_space(world.main.window.size.cast<float>() * 0.5f), *newRotationAngle - world.drawData.cam.c.rotation);
*newRotationAngle = world.drawData.cam.c.rotation; *newRotationAngle = world.drawData.cam.c.rotation;
}); });
t.color_button_left("Foreground color", &world.main.toolConfig.globalConf.foregroundColor);
t.color_button_left("Background color", &world.main.toolConfig.globalConf.backgroundColor);
} }
}); });
}); });
@ -445,6 +449,11 @@ void DrawingProgram::selection_action_menu(Vector2f popupPos) {
selection.push_selection_to_back(); selection.push_selection_to_back();
}); });
} }
}, LayoutElement::Callbacks{
.mouseButton = [&](const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) {
if(button.down && button.button != InputManager::MouseButton::RIGHT)
clear_right_click_popup();
}
}); });
}); });
} }

View file

@ -22,13 +22,13 @@ void EllipseDrawEditTool::edit_gui(CanvasComponentContainer::ObjInfo* comp) {
auto& a = static_cast<EllipseCanvasComponent&>(comp->obj->get_comp()); auto& a = static_cast<EllipseCanvasComponent&>(comp->obj->get_comp());
auto& gui = drawP.world.main.g.gui; auto& gui = drawP.world.main.g.gui;
Toolbar& t = drawP.world.main.toolbar;
auto commit_update_func = [&, comp] { comp->obj->commit_update(drawP); }; auto commit_update_func = [&, comp] { comp->obj->commit_update(drawP); };
auto commit_update_and_layout_func = [&, comp] { auto commit_update_and_layout_func = [&, comp] {
comp->obj->commit_update(drawP); comp->obj->commit_update(drawP);
drawP.world.main.g.gui.set_to_layout(); drawP.world.main.g.gui.set_to_layout();
}; };
Toolbar& t = drawP.world.main.toolbar;
gui.new_id("edit tool ellipse", [&] { gui.new_id("edit tool ellipse", [&] {
text_label_centered(gui, "Edit Ellipse"); text_label_centered(gui, "Edit Ellipse");
radio_button_selector(gui, "Fill selector", &a.d.fillStrokeMode, { radio_button_selector(gui, "Fill selector", &a.d.fillStrokeMode, {
@ -38,16 +38,14 @@ void EllipseDrawEditTool::edit_gui(CanvasComponentContainer::ObjInfo* comp) {
}, commit_update_and_layout_func); }, commit_update_and_layout_func);
if(a.d.fillStrokeMode == 0 || a.d.fillStrokeMode == 2) { if(a.d.fillStrokeMode == 0 || a.d.fillStrokeMode == 2) {
left_to_right_line_layout(gui, [&] { left_to_right_line_layout(gui, [&] {
//if(gui.color_button_big("Fill Color", &a.d.fillColor, &a.d.fillColor == t.colorRight)) t.color_button_right("Fill color button", &a.d.fillColor, commit_update_func);
// t.color_selector_right(&a.d.fillColor == t.colorRight ? nullptr : &a.d.fillColor);
text_label(gui, "Fill Color"); text_label(gui, "Fill Color");
}); });
} }
if(a.d.fillStrokeMode == 1 || a.d.fillStrokeMode == 2) { if(a.d.fillStrokeMode == 1 || a.d.fillStrokeMode == 2) {
slider_scalar_field(gui, "relstrokewidth", "Outline Size", &a.d.strokeWidth, 3.0f, 40.0f, {.onEdit = commit_update_func}); slider_scalar_field(gui, "relstrokewidth", "Outline Size", &a.d.strokeWidth, 3.0f, 40.0f, {.onEdit = commit_update_func});
left_to_right_line_layout(gui, [&] { left_to_right_line_layout(gui, [&] {
//if(gui.color_button_big("Outline Color", &a.d.strokeColor, &a.d.strokeColor == t.colorRight)) t.color_button_right("Outline color button", &a.d.strokeColor, commit_update_func);
// t.color_selector_right(&a.d.strokeColor == t.colorRight ? nullptr : &a.d.strokeColor);
text_label(gui, "Outline Color"); text_label(gui, "Outline Color");
}); });
} }

View file

@ -36,16 +36,14 @@ void RectDrawEditTool::edit_gui(CanvasComponentContainer::ObjInfo* comp) {
}, commit_update_and_layout_func); }, commit_update_and_layout_func);
if(a.d.fillStrokeMode == 0 || a.d.fillStrokeMode == 2) { if(a.d.fillStrokeMode == 0 || a.d.fillStrokeMode == 2) {
left_to_right_line_layout(gui, [&] { left_to_right_line_layout(gui, [&] {
//if(gui.color_button_big("Fill Color", &a.d.fillColor, &a.d.fillColor == t.colorRight)) t.color_button_right("Fill color button", &a.d.fillColor, commit_update_func);
// t.color_selector_right(&a.d.fillColor == t.colorRight ? nullptr : &a.d.fillColor);
text_label(gui, "Fill Color"); text_label(gui, "Fill Color");
}); });
} }
if(a.d.fillStrokeMode == 1 || a.d.fillStrokeMode == 2) { if(a.d.fillStrokeMode == 1 || a.d.fillStrokeMode == 2) {
slider_scalar_field(gui, "relstrokewidth", "Outline Size", &a.d.strokeWidth, 3.0f, 40.0f, { .onEdit = commit_update_func }); slider_scalar_field(gui, "relstrokewidth", "Outline Size", &a.d.strokeWidth, 3.0f, 40.0f, { .onEdit = commit_update_func });
left_to_right_line_layout(gui, [&] { left_to_right_line_layout(gui, [&] {
//if(gui.color_button_big("Outline Color", &a.d.strokeColor, &a.d.strokeColor == t.colorRight)) t.color_button_right("Outline color button", &a.d.strokeColor, commit_update_func);
// t.color_selector_right(&a.d.strokeColor == t.colorRight ? nullptr : &a.d.strokeColor);
text_label(gui, "Outline Color"); text_label(gui, "Outline Color");
}); });
} }

View file

@ -52,9 +52,9 @@ template <typename T> void color_button(GUIManager& gui, const char* id, T* val,
d.innerContent = [&] (const SelectableButton::InnerContentCallbackParameters&) { d.innerContent = [&] (const SelectableButton::InnerContentCallbackParameters&) {
gui.element<ColorRectangleDisplay>("color display", [val, hasAlpha = options.hasAlpha] { gui.element<ColorRectangleDisplay>("color display", [val, hasAlpha = options.hasAlpha] {
if(hasAlpha) if(hasAlpha)
return SkColor4f{(*val)[0], (*val)[1], (*val)[2], 1.0f};
else
return SkColor4f{(*val)[0], (*val)[1], (*val)[2], (*val)[3]}; return SkColor4f{(*val)[0], (*val)[1], (*val)[2], (*val)[3]};
else
return SkColor4f{(*val)[0], (*val)[1], (*val)[2], 1.0f};
}); });
}; };
CLAY_AUTO_ID({.layout = {.sizing = {.width = CLAY_SIZING_FIXED(options.size), .height = CLAY_SIZING_FIXED(options.size) } } }) { CLAY_AUTO_ID({.layout = {.sizing = {.width = CLAY_SIZING_FIXED(options.size), .height = CLAY_SIZING_FIXED(options.size) } } }) {

View file

@ -16,7 +16,7 @@ vec4 main(vec2 fragcoord) {
vec4 alphaBoard1 = vec4(0.2, 0.2, 0.2, 1.0); vec4 alphaBoard1 = vec4(0.2, 0.2, 0.2, 1.0);
vec4 alphaBoard2 = vec4(0.8, 0.8, 0.8, 1.0); vec4 alphaBoard2 = vec4(0.8, 0.8, 0.8, 1.0);
vec2 flooredCoords = floor(fragcoord / 10); vec2 flooredCoords = floor(fragcoord / 5);
bool isDark = mod(flooredCoords.x + flooredCoords.y, 2.0) > 0.5; bool isDark = mod(flooredCoords.x + flooredCoords.y, 2.0) > 0.5;
return isDark ? alphaBoard2 : alphaBoard1; return isDark ? alphaBoard2 : alphaBoard1;

View file

@ -160,14 +160,44 @@ std::filesystem::path& Toolbar::file_selector_path() {
return filePicker.currentSearchPath; return filePicker.currentSearchPath;
} }
void Toolbar::color_selector_left(Vector4f* color) { void Toolbar::color_button_left(const char* id, Vector4f* color, const std::function<void()>& onChange) {
colorLeft = color; auto& gui = main.g.gui;
justAssignedColorLeft = true; color_button(gui, id, color, {
.isSelected = colorLeft == color,
.onClick = [&, onChange, color] {
color_selector_left(color, onChange);
}
});
} }
void Toolbar::color_selector_right(Vector4f* color) { void Toolbar::color_button_right(const char* id, Vector4f* color, const std::function<void()>& onChange) {
colorRight = color; auto& gui = main.g.gui;
justAssignedColorRight = true; color_button(gui, id, color, {
.isSelected = colorRight == color,
.onClick = [&, onChange, color] {
color_selector_right(color, onChange);
}
});
}
void Toolbar::color_selector_left(Vector4f* color, const std::function<void()>& onChange) {
if(colorLeft != color) {
colorLeftJustEnabled = color;
onColorLeftChange = onChange;
}
else
colorLeftJustDisabled = true;
main.g.gui.set_to_layout();
}
void Toolbar::color_selector_right(Vector4f* color, const std::function<void()>& onChange) {
if(colorRight != color) {
colorRightJustEnabled = color;
onColorRightChange = onChange;
}
else
colorRightJustDisabled = true;
main.g.gui.set_to_layout();
} }
void Toolbar::load_licenses() { void Toolbar::load_licenses() {
@ -255,6 +285,12 @@ void Toolbar::layout_run() {
close_popup_gui(); close_popup_gui();
} }
// Make sure theyre set to null in case drawing_program_gui wasn't called
colorLeftJustEnabled = nullptr;
colorLeftJustDisabled = false;
colorRightJustEnabled = nullptr;
colorRightJustDisabled = false;
if(!main.world->clientStillConnecting) { if(!main.world->clientStillConnecting) {
//if(io.hoverObstructed && (io.mouse.leftClick || io.mouse.rightClick)) //if(io.hoverObstructed && (io.mouse.leftClick || io.mouse.rightClick))
// rightClickPopupLocation = std::nullopt; // rightClickPopupLocation = std::nullopt;
@ -268,9 +304,6 @@ void Toolbar::layout_run() {
// rightClickPopupLocation = std::nullopt; // rightClickPopupLocation = std::nullopt;
} }
justAssignedColorLeft = false;
justAssignedColorRight = false;
if(!optionsMenuOpen || generalSettingsOptions != GSETTINGS_KEYBINDS) if(!optionsMenuOpen || generalSettingsOptions != GSETTINGS_KEYBINDS)
keybindWaiting = std::nullopt; keybindWaiting = std::nullopt;
} }
@ -544,108 +577,110 @@ void Toolbar::top_toolbar() {
layer_menu(layerMenuPopUpJustOpen); layer_menu(layerMenuPopUpJustOpen);
} }
if(menuPopUpOpen) { if(menuPopUpOpen) {
gui.element<LayoutElement>("main menu popup", [&] (const Clay_ElementId& id) { gui.set_z_index(5, [&] {
CLAY(id, { gui.element<LayoutElement>("main menu popup", [&] (const Clay_ElementId& id) {
.layout = { CLAY(id, {
.sizing = {.width = CLAY_SIZING_FIT(100), .height = CLAY_SIZING_FIT(0) }, .layout = {
.padding = CLAY_PADDING_ALL(io.theme->padding1), .sizing = {.width = CLAY_SIZING_FIT(100), .height = CLAY_SIZING_FIT(0) },
.childGap = 1, .padding = CLAY_PADDING_ALL(io.theme->padding1),
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP}, .childGap = 1,
.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_LEFT_TOP, .parent = CLAY_ATTACH_POINT_LEFT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT} .cornerRadius = CLAY_CORNER_RADIUS(io.theme->windowCorners1),
}) { .floating = {.offset = {.x = 0, .y = static_cast<float>(io.theme->padding1)}, .zIndex = gui.get_z_index(), .attachPoints = {.element = CLAY_ATTACH_POINT_LEFT_TOP, .parent = CLAY_ATTACH_POINT_LEFT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
auto menu_popup_text_button = [&](const char* id, const char* str, const std::function<void()>& onClick) { }) {
text_button(gui, id, str, { auto menu_popup_text_button = [&](const char* id, const char* str, const std::function<void()>& onClick) {
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL, text_button(gui, id, str, {
.wide = true, .drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
.centered = false, .wide = true,
.onClick = [&, onClick]{ .centered = false,
onClick(); .onClick = [&, onClick]{
menuPopUpOpen = false; onClick();
} menuPopUpOpen = false;
}
});
};
menu_popup_text_button("new file local", "New File", [&] {
main.new_tab({
.isClient = false
}, true);
}); });
}; menu_popup_text_button("open file", "Open", [&] { open_world_file(false, "", ""); });
menu_popup_text_button("new file local", "New File", [&] { if(!main.world->clientStillConnecting) {
main.new_tab({ menu_popup_text_button("save file", "Save", [&] { save_func(); });
.isClient = false menu_popup_text_button("save as file", "Save As", [&] { save_as_func(); });
}, true); menu_popup_text_button("screenshot", "Screenshot", [&] { main.world->drawProg.switch_to_tool(DrawingProgramToolType::SCREENSHOT); });
}); menu_popup_text_button("add image or file to canvas", "Add Image/File to Canvas", [&] {
menu_popup_text_button("open file", "Open", [&] { open_world_file(false, "", ""); }); #ifdef __EMSCRIPTEN__
if(!main.world->clientStillConnecting) { static std::weak_ptr<World> worldWeakPtr;
menu_popup_text_button("save file", "Save", [&] { save_func(); }); worldWeakPtr = make_weak_ptr(main.world);
menu_popup_text_button("save as file", "Save As", [&] { save_as_func(); }); emscripten_browser_file::upload("*", [](std::string const& fileName, std::string const& mimeType, std::string_view buffer, void* callbackData) {
menu_popup_text_button("screenshot", "Screenshot", [&] { main.world->drawProg.switch_to_tool(DrawingProgramToolType::SCREENSHOT); }); if(!buffer.empty()) {
menu_popup_text_button("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); else
emscripten_browser_file::upload("*", [](std::string const& fileName, std::string const& mimeType, std::string_view buffer, void* callbackData) { Logger::get().log("INFO", "Loading image to canvas that has been destroyed");
if(!buffer.empty()) { }
auto world = ((std::weak_ptr<World>*)callbackData)->lock(); }, &worldWeakPtr);
if(world) #else
world->drawProg.add_file_to_canvas_by_data(fileName, buffer, world->main.window.size.cast<float>() / 2.0f); 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, 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(); menu_popup_text_button("lobby info", "Lobby Info", [&] {
if(wLock) optionsMenuOpen = true;
wLock->drawProg.add_file_to_canvas_by_path(p, 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");
}); });
#endif }
}); menu_popup_text_button("start hosting", "Host", [&] {
if(main.world->netObjMan.is_connected()) { serverLocalID = NetLibrary::get_random_server_local_id();
menu_popup_text_button("lobby info", "Lobby Info", [&] { serverToConnectTo = NetLibrary::get_global_id() + serverLocalID;
optionsMenuOpen = true; optionsMenuOpen = true;
optionsMenuType = LOBBY_INFO_MENU; optionsMenuType = HOST_MENU;
});
menu_popup_text_button("canvas specific settings", "Canvas Settings", [&] {
optionsMenuOpen = true;
optionsMenuType = CANVAS_SETTINGS_MENU;
}); });
} }
menu_popup_text_button("start hosting", "Host", [&] { menu_popup_text_button("start connecting", "Connect", [&] {
serverLocalID = NetLibrary::get_random_server_local_id(); serverToConnectTo.clear();
serverToConnectTo = NetLibrary::get_global_id() + serverLocalID;
optionsMenuOpen = true; optionsMenuOpen = true;
optionsMenuType = HOST_MENU; optionsMenuType = CONNECT_MENU;
}); });
menu_popup_text_button("canvas specific settings", "Canvas Settings", [&] { menu_popup_text_button("open options", "Settings", [&] {
optionsMenuOpen = true; optionsMenuOpen = true;
optionsMenuType = CANVAS_SETTINGS_MENU; optionsMenuType = GENERAL_SETTINGS_MENU;
}); });
} menu_popup_text_button("about menu button", "About", [&] {
menu_popup_text_button("start connecting", "Connect", [&] { optionsMenuOpen = true;
serverToConnectTo.clear(); optionsMenuType = ABOUT_MENU;
optionsMenuOpen = true;
optionsMenuType = CONNECT_MENU;
});
menu_popup_text_button("open options", "Settings", [&] {
optionsMenuOpen = true;
optionsMenuType = GENERAL_SETTINGS_MENU;
});
menu_popup_text_button("about menu button", "About", [&] {
optionsMenuOpen = true;
optionsMenuType = ABOUT_MENU;
});
#ifndef __EMSCRIPTEN__
menu_popup_text_button("quit button", "Quit", [&] {
if(main.app_close_requested())
main.setToQuit = true;
}); });
#endif #ifndef __EMSCRIPTEN__
} menu_popup_text_button("quit button", "Quit", [&] {
}, LayoutElement::Callbacks { if(main.app_close_requested())
.mouseButton = [&](const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) { main.setToQuit = true;
if(!mouseHovering && button.down && !menuPopupOpenFlipped) { });
menuPopUpOpen = false; #endif
menuPopupOpenFlipped = true;
gui.set_to_layout();
} }
} }, LayoutElement::Callbacks {
.mouseButton = [&](const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) {
if(!mouseHovering && button.down && !menuPopupOpenFlipped) {
menuPopUpOpen = false;
menuPopupOpenFlipped = true;
gui.set_to_layout();
}
}
});
}); });
} }
} }
@ -1172,71 +1207,71 @@ void Toolbar::drawing_program_gui() {
}, },
}) { }) {
main.world->drawProg.toolbar_gui(); main.world->drawProg.toolbar_gui();
isUpdatingColorLeft = isUpdatingColorRight = false;
//if(colorLeft) { if(colorLeftJustEnabled)
// CLAY_AUTO_ID({ colorLeft = colorLeftJustEnabled;
// .layout = { else if(colorLeftJustDisabled)
// .padding = {.top = 40, .bottom = 40} colorLeft = nullptr;
// }
// }) { if(colorRightJustEnabled)
// auto localId = CLAY_ID_LOCAL("Drawing program gui color picker left"); colorRight = colorRightJustEnabled;
// CLAY(localId, { else if(colorRightJustDisabled)
// .layout = { colorRight = nullptr;
// .sizing = {.width = CLAY_SIZING_FIT(300), .height = CLAY_SIZING_FIT(0)},
// .padding = CLAY_PADDING_ALL(io.theme->padding1), if(colorLeft)
// .childGap = io.theme->childGap1, color_picker_window("Drawing program gui color picker left", &colorLeft, &colorLeftJustDisabled, onColorLeftChange);
// .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)
// }) {
// gui.obstructing_window(localId);
// isUpdatingColorLeft |= gui.color_picker_items("colorpickerleft", colorLeft, true, 300.0f - io.theme->padding1 * 2.0f);
// bool hoveringOnDropdown = false;
// isUpdatingColorLeft |= color_palette("colorpickerleftpalette", colorLeft, hoveringOnDropdown);
// if(!Clay_Hovered() && !justAssignedColorLeft && !hoveringOnDropdown && io.mouse.leftClick)
// colorLeft = nullptr;
// }
// }
//}
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_GROW(0)}
} }
}) {} }) {}
//if(colorRight) { if(colorRight)
// CLAY_AUTO_ID({ color_picker_window("Drawing program gui color picker right", &colorRight, &colorRightJustDisabled, onColorRightChange);
// .layout = {
// .padding = {.top = 40, .bottom = 40}
// }
// }) {
// auto localID = CLAY_ID_LOCAL("Drawing program gui color picker right");
// CLAY(localID, {
// .layout = {
// .sizing = {.width = CLAY_SIZING_FIT(300), .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)
// }) {
// gui.obstructing_window(localID);
// isUpdatingColorRight |= gui.color_picker_items("colorpickerright", colorRight, true, 300.0f - io.theme->padding1 * 2.0f);
// bool hoveringOnDropdown = false;
// isUpdatingColorRight |= color_palette("colorpickerrightpalette", colorRight, hoveringOnDropdown);
// if(!Clay_Hovered() && !justAssignedColorRight && !hoveringOnDropdown && io.mouse.leftClick)
// colorRight = nullptr;
// }
// }
//}
main.world->drawProg.tool_options_gui(); main.world->drawProg.tool_options_gui();
main.world->drawProg.right_click_popup_gui(); main.world->drawProg.right_click_popup_gui();
} }
} }
void Toolbar::color_picker_window(const char* id, Vector4f** color, bool* colorJustDisabled, const std::function<void()>& onChange) {
auto& gui = main.g.gui;
CLAY_AUTO_ID({
.layout = {
.padding = {.top = 40, .bottom = 40}
}
}) {
main.g.gui.element<LayoutElement>(id, [&](const Clay_ElementId& lId) {
CLAY(lId, {
.layout = {
.sizing = {.width = CLAY_SIZING_FIT(300), .height = CLAY_SIZING_FIT(0)},
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
.childGap = gui.io.theme->childGap1,
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP},
.layoutDirection = CLAY_TOP_TO_BOTTOM
},
.backgroundColor = convert_vec4<Clay_Color>(gui.io.theme->backColor1),
.cornerRadius = CLAY_CORNER_RADIUS(gui.io.theme->windowCorners1)
}) {
//template <typename T> void color_picker_items(GUIManager& gui, const char* id, T* val, const ColorPickerItemsOptions& options = {}) {
color_picker_items(gui, "colorpicker", *color, {
.onEdit = onChange
});
//isUpdatingColorLeft |= color_palette("colorpickerleftpalette", colorLeft, hoveringOnDropdown);
//if(!Clay_Hovered() && !justAssignedColorLeft && !hoveringOnDropdown && io.mouse.leftClick)
// colorLeft = nullptr;
}
}, LayoutElement::Callbacks{
.mouseButton = [&, colorJustDisabled](const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) {
if(!mouseHovering && button.down) {
*colorJustDisabled = true;
main.g.gui.set_to_layout();
}
}
});
}
}
bool Toolbar::color_palette(const char* id, Vector4f* color, bool& hoveringOnDropdown) { bool Toolbar::color_palette(const char* id, Vector4f* color, bool& hoveringOnDropdown) {
auto& gui = main.g.gui; auto& gui = main.g.gui;
auto& io = gui.io; auto& io = gui.io;
@ -1508,21 +1543,23 @@ void Toolbar::center_obstructing_window_gui(const char* id, Clay_SizingAxis x, C
auto& gui = main.g.gui; auto& gui = main.g.gui;
auto& io = gui.io; auto& io = gui.io;
gui.element<LayoutElement>(id, [&] (const Clay_ElementId& id) { gui.set_z_index(100, [&] {
CLAY(id, { gui.element<LayoutElement>(id, [&] (const Clay_ElementId& id) {
.layout = { CLAY(id, {
.sizing = {.width = x, .height = y }, .layout = {
.padding = CLAY_PADDING_ALL(io.theme->padding1), .sizing = {.width = x, .height = y },
.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 = {.attachPoints = {.element = CLAY_ATTACH_POINT_CENTER_CENTER, .parent = CLAY_ATTACH_POINT_CENTER_CENTER}, .attachTo = CLAY_ATTACH_TO_PARENT} .cornerRadius = CLAY_CORNER_RADIUS(io.theme->windowCorners1),
}) { .floating = {.zIndex = gui.get_z_index(), .attachPoints = {.element = CLAY_ATTACH_POINT_CENTER_CENTER, .parent = CLAY_ATTACH_POINT_CENTER_CENTER}, .attachTo = CLAY_ATTACH_TO_PARENT}
innerContent(); }) {
} innerContent();
}
});
}); });
} }

View file

@ -42,8 +42,11 @@ class Toolbar {
Toolbar(MainProgram& initMain); Toolbar(MainProgram& initMain);
void layout_run(); void layout_run();
void color_selector_left(Vector4f* color); void color_selector_left(Vector4f* color, const std::function<void()>& onChange = nullptr);
void color_selector_right(Vector4f* color); void color_selector_right(Vector4f* color, const std::function<void()>& onChange = nullptr);
void color_button_left(const char* id, Vector4f* color, const std::function<void()>& onChange = nullptr);
void color_button_right(const char* id, Vector4f* color, const std::function<void()>& onChange = nullptr);
void paint_popup(Vector2f popupPos); void paint_popup(Vector2f popupPos);
typedef std::function<void(const std::filesystem::path&, const ExtensionFilter& extensionSelected)> OpenFileSelectorCallback; typedef std::function<void(const std::filesystem::path&, const ExtensionFilter& extensionSelected)> OpenFileSelectorCallback;
@ -57,9 +60,13 @@ class Toolbar {
void load_licenses(); void load_licenses();
Vector4f* colorLeft = nullptr; Vector4f* colorLeft = nullptr;
bool colorLeftJustDisabled = false;
Vector4f* colorLeftJustEnabled = nullptr;
std::function<void()> onColorLeftChange;
Vector4f* colorRight = nullptr; Vector4f* colorRight = nullptr;
bool isUpdatingColorLeft = false; bool colorRightJustDisabled = false;
bool isUpdatingColorRight = false; Vector4f* colorRightJustEnabled = nullptr;
std::function<void()> onColorRightChange;
bool app_close_requested(); bool app_close_requested();
private: private:
@ -81,6 +88,7 @@ class Toolbar {
void file_picker_gui_done(); void file_picker_gui_done();
void file_picker_gui(); void file_picker_gui();
void performance_metrics(); void performance_metrics();
void color_picker_window(const char* id, Vector4f** color, bool* colorJustDisabled, const std::function<void()>& onChange);
bool color_palette(const char* id, Vector4f* color, bool& hoveringOnDropdown); bool color_palette(const char* id, Vector4f* color, bool& hoveringOnDropdown);
void open_world_file(bool isClient, const std::string& netSource, const std::string& serverLocalID); void open_world_file(bool isClient, const std::string& netSource, const std::string& serverLocalID);
void load_default_palette(); void load_default_palette();
@ -140,9 +148,6 @@ class Toolbar {
bool openedSaveAsMenu = false; bool openedSaveAsMenu = false;
} themeData; } themeData;
bool justAssignedColorLeft = false;
bool justAssignedColorRight = false;
bool showPerformance = false; bool showPerformance = false;
bool menuPopUpOpen = false; bool menuPopUpOpen = false;