fixes
This commit is contained in:
parent
6210e9c99b
commit
2254ad53c5
11 changed files with 300 additions and 466 deletions
|
|
@ -20,14 +20,39 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
|
||||
export module Crafter.CppDOM:HtmlElement;
|
||||
import std;
|
||||
import :Bindings;
|
||||
import :BindingsExport;
|
||||
import :BindingsImport;
|
||||
import :EventTypes;
|
||||
|
||||
namespace Crafter {
|
||||
export class HtmlElement {
|
||||
public:
|
||||
void* const ptr;
|
||||
std::vector<std::int32_t> handlers;
|
||||
std::vector<std::int32_t> clickHandlers;
|
||||
std::vector<std::int32_t> mouseOverHandlers;
|
||||
std::vector<std::int32_t> mouseOutHandlers;
|
||||
std::vector<std::int32_t> mouseMoveHandlers;
|
||||
std::vector<std::int32_t> mouseDownHandlers;
|
||||
std::vector<std::int32_t> mouseUpHandlers;
|
||||
std::vector<std::int32_t> focusHandlers;
|
||||
std::vector<std::int32_t> blurHandlers;
|
||||
std::vector<std::int32_t> keyDownHandlers;
|
||||
std::vector<std::int32_t> keyUpHandlers;
|
||||
std::vector<std::int32_t> keyPressHandlers;
|
||||
std::vector<std::int32_t> changeHandlers;
|
||||
std::vector<std::int32_t> submitHandlers;
|
||||
std::vector<std::int32_t> inputHandlers;
|
||||
std::vector<std::int32_t> resizeHandlers;
|
||||
std::vector<std::int32_t> scrollHandlers;
|
||||
std::vector<std::int32_t> contextMenuHandlers;
|
||||
std::vector<std::int32_t> dragStartHandlers;
|
||||
std::vector<std::int32_t> dragEndHandlers;
|
||||
std::vector<std::int32_t> dropHandlers;
|
||||
std::vector<std::int32_t> dragOverHandlers;
|
||||
std::vector<std::int32_t> dragEnterHandlers;
|
||||
std::vector<std::int32_t> dragLeaveHandlers;
|
||||
std::vector<std::int32_t> wheelHandlers;
|
||||
|
||||
HtmlElement(const std::string_view id): ptr(CppDOMBindings::GetElementById(id)) {
|
||||
|
||||
}
|
||||
|
|
@ -38,89 +63,86 @@ namespace Crafter {
|
|||
CppDOMBindings::SetInnerHTML(ptr, html);
|
||||
}
|
||||
|
||||
// Event handling methods with event data
|
||||
|
||||
// Mouse Events
|
||||
std::int32_t AddClickListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::clickHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
clickHandlers.push_back(id);
|
||||
CppDOMBindings::clickHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddClickListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveClickListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
clickHandlers.erase(std::remove(clickHandlers.begin(), clickHandlers.end(), id), clickHandlers.end());
|
||||
CppDOMBindings::clickHandlers->erase(id);
|
||||
CppDOMBindings::RemoveClickListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddMouseOverListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::mouseOverHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
mouseOverHandlers.push_back(id);
|
||||
CppDOMBindings::mouseOverHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddMouseOverListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveMouseOverListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
mouseOverHandlers.erase(std::remove(mouseOverHandlers.begin(), mouseOverHandlers.end(), id), mouseOverHandlers.end());
|
||||
CppDOMBindings::mouseOverHandlers->erase(id);
|
||||
CppDOMBindings::RemoveMouseOverListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddMouseOutListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::mouseOutHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
mouseOutHandlers.push_back(id);
|
||||
CppDOMBindings::mouseOutHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddMouseOutListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveMouseOutListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
mouseOutHandlers.erase(std::remove(mouseOutHandlers.begin(), mouseOutHandlers.end(), id), mouseOutHandlers.end());
|
||||
CppDOMBindings::mouseOutHandlers->erase(id);
|
||||
CppDOMBindings::RemoveMouseOutListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddMouseMoveListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::mouseMoveHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
mouseMoveHandlers.push_back(id);
|
||||
CppDOMBindings::mouseMoveHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddMouseMoveListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveMouseMoveListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
mouseMoveHandlers.erase(std::remove(mouseMoveHandlers.begin(), mouseMoveHandlers.end(), id), mouseMoveHandlers.end());
|
||||
CppDOMBindings::mouseMoveHandlers->erase(id);
|
||||
CppDOMBindings::RemoveMouseMoveListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddMouseDownListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::mouseDownHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
mouseDownHandlers.push_back(id);
|
||||
CppDOMBindings::mouseDownHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddMouseDownListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveMouseDownListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
mouseDownHandlers.erase(std::remove(mouseDownHandlers.begin(), mouseDownHandlers.end(), id), mouseDownHandlers.end());
|
||||
CppDOMBindings::mouseDownHandlers->erase(id);
|
||||
CppDOMBindings::RemoveMouseDownListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddMouseUpListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::mouseUpHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
mouseUpHandlers.push_back(id);
|
||||
CppDOMBindings::mouseUpHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddMouseUpListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveMouseUpListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
mouseUpHandlers.erase(std::remove(mouseUpHandlers.begin(), mouseUpHandlers.end(), id), mouseUpHandlers.end());
|
||||
CppDOMBindings::mouseUpHandlers->erase(id);
|
||||
CppDOMBindings::RemoveMouseUpListener(ptr, id);
|
||||
}
|
||||
|
|
@ -128,28 +150,28 @@ namespace Crafter {
|
|||
// Focus Events
|
||||
std::int32_t AddFocusListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::focusHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
focusHandlers.push_back(id);
|
||||
CppDOMBindings::focusHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddFocusListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveFocusListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
focusHandlers.erase(std::remove(focusHandlers.begin(), focusHandlers.end(), id), focusHandlers.end());
|
||||
CppDOMBindings::focusHandlers->erase(id);
|
||||
CppDOMBindings::RemoveFocusListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddBlurListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::blurHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
blurHandlers.push_back(id);
|
||||
CppDOMBindings::blurHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddBlurListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveBlurListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
blurHandlers.erase(std::remove(blurHandlers.begin(), blurHandlers.end(), id), blurHandlers.end());
|
||||
CppDOMBindings::blurHandlers->erase(id);
|
||||
CppDOMBindings::RemoveBlurListener(ptr, id);
|
||||
}
|
||||
|
|
@ -157,42 +179,42 @@ namespace Crafter {
|
|||
// Keyboard Events
|
||||
std::int32_t AddKeyDownListener(std::function<void(KeyboardEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::keyDownHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
keyDownHandlers.push_back(id);
|
||||
CppDOMBindings::keyDownHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddKeyDownListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveKeyDownListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
keyDownHandlers.erase(std::remove(keyDownHandlers.begin(), keyDownHandlers.end(), id), keyDownHandlers.end());
|
||||
CppDOMBindings::keyDownHandlers->erase(id);
|
||||
CppDOMBindings::RemoveKeyDownListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddKeyUpListener(std::function<void(KeyboardEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::keyUpHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
keyUpHandlers.push_back(id);
|
||||
CppDOMBindings::keyUpHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddKeyUpListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveKeyUpListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
keyUpHandlers.erase(std::remove(keyUpHandlers.begin(), keyUpHandlers.end(), id), keyUpHandlers.end());
|
||||
CppDOMBindings::keyUpHandlers->erase(id);
|
||||
CppDOMBindings::RemoveKeyUpListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddKeyPressListener(std::function<void(KeyboardEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::keyPressHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
keyPressHandlers.push_back(id);
|
||||
CppDOMBindings::keyPressHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddKeyPressListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveKeyPressListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
keyPressHandlers.erase(std::remove(keyPressHandlers.begin(), keyPressHandlers.end(), id), keyPressHandlers.end());
|
||||
CppDOMBindings::keyPressHandlers->erase(id);
|
||||
CppDOMBindings::RemoveKeyPressListener(ptr, id);
|
||||
}
|
||||
|
|
@ -200,70 +222,70 @@ namespace Crafter {
|
|||
// Form Events
|
||||
std::int32_t AddChangeListener(std::function<void(ChangeEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::changeHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
changeHandlers.push_back(id);
|
||||
CppDOMBindings::changeHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddChangeListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveChangeListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
changeHandlers.erase(std::remove(changeHandlers.begin(), changeHandlers.end(), id), changeHandlers.end());
|
||||
CppDOMBindings::changeHandlers->erase(id);
|
||||
CppDOMBindings::RemoveChangeListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddSubmitListener(std::function<void(void)> callback) {
|
||||
std::int32_t id = CppDOMBindings::submitHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
submitHandlers.push_back(id);
|
||||
CppDOMBindings::submitHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddSubmitListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveSubmitListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
submitHandlers.erase(std::remove(submitHandlers.begin(), submitHandlers.end(), id), submitHandlers.end());
|
||||
CppDOMBindings::submitHandlers->erase(id);
|
||||
CppDOMBindings::RemoveSubmitListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddInputListener(std::function<void(InputEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::inputHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
inputHandlers.push_back(id);
|
||||
CppDOMBindings::inputHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddInputListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveInputListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
inputHandlers.erase(std::remove(inputHandlers.begin(), inputHandlers.end(), id), inputHandlers.end());
|
||||
CppDOMBindings::inputHandlers->erase(id);
|
||||
CppDOMBindings::RemoveInputListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddResizeListener(std::function<void(ResizeEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::resizeHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
resizeHandlers.push_back(id);
|
||||
CppDOMBindings::resizeHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddResizeListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveResizeListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
resizeHandlers.erase(std::remove(resizeHandlers.begin(), resizeHandlers.end(), id), resizeHandlers.end());
|
||||
CppDOMBindings::resizeHandlers->erase(id);
|
||||
CppDOMBindings::RemoveResizeListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddScrollListener(std::function<void(ScrollEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::scrollHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
scrollHandlers.push_back(id);
|
||||
CppDOMBindings::scrollHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddScrollListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveScrollListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
scrollHandlers.erase(std::remove(scrollHandlers.begin(), scrollHandlers.end(), id), scrollHandlers.end());
|
||||
CppDOMBindings::scrollHandlers->erase(id);
|
||||
CppDOMBindings::RemoveScrollListener(ptr, id);
|
||||
}
|
||||
|
|
@ -271,14 +293,14 @@ namespace Crafter {
|
|||
// Context Menu Events
|
||||
std::int32_t AddContextMenuListener(std::function<void(MouseEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::contextMenuHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
contextMenuHandlers.push_back(id);
|
||||
CppDOMBindings::contextMenuHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddContextMenuListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveContextMenuListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
contextMenuHandlers.erase(std::remove(contextMenuHandlers.begin(), contextMenuHandlers.end(), id), contextMenuHandlers.end());
|
||||
CppDOMBindings::contextMenuHandlers->erase(id);
|
||||
CppDOMBindings::RemoveContextMenuListener(ptr, id);
|
||||
}
|
||||
|
|
@ -286,42 +308,42 @@ namespace Crafter {
|
|||
// Drag and Drop Events
|
||||
std::int32_t AddDragStartListener(std::function<void(MouseEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::dragStartHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
dragStartHandlers.push_back(id);
|
||||
CppDOMBindings::dragStartHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddDragStartListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveDragStartListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
dragStartHandlers.erase(std::remove(dragStartHandlers.begin(), dragStartHandlers.end(), id), dragStartHandlers.end());
|
||||
CppDOMBindings::dragStartHandlers->erase(id);
|
||||
CppDOMBindings::RemoveDragStartListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddDragEndListener(std::function<void(MouseEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::dragEndHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
dragEndHandlers.push_back(id);
|
||||
CppDOMBindings::dragEndHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddDragEndListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveDragEndListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
dragEndHandlers.erase(std::remove(dragEndHandlers.begin(), dragEndHandlers.end(), id), dragEndHandlers.end());
|
||||
CppDOMBindings::dragEndHandlers->erase(id);
|
||||
CppDOMBindings::RemoveDragEndListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddDropListener(std::function<void(MouseEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::dropHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
dropHandlers.push_back(id);
|
||||
CppDOMBindings::dropHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddDropListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveDropListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
dropHandlers.erase(std::remove(dropHandlers.begin(), dropHandlers.end(), id), dropHandlers.end());
|
||||
CppDOMBindings::dropHandlers->erase(id);
|
||||
CppDOMBindings::RemoveDropListener(ptr, id);
|
||||
}
|
||||
|
|
@ -329,42 +351,42 @@ namespace Crafter {
|
|||
// Additional Drag Events
|
||||
std::int32_t AddDragOverListener(std::function<void(MouseEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::dragOverHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
dragOverHandlers.push_back(id);
|
||||
CppDOMBindings::dragOverHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddDragOverListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveDragOverListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
dragOverHandlers.erase(std::remove(dragOverHandlers.begin(), dragOverHandlers.end(), id), dragOverHandlers.end());
|
||||
CppDOMBindings::dragOverHandlers->erase(id);
|
||||
CppDOMBindings::RemoveDragOverListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddDragEnterListener(std::function<void(MouseEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::dragEnterHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
dragEnterHandlers.push_back(id);
|
||||
CppDOMBindings::dragEnterHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddDragEnterListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveDragEnterListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
dragEnterHandlers.erase(std::remove(dragEnterHandlers.begin(), dragEnterHandlers.end(), id), dragEnterHandlers.end());
|
||||
CppDOMBindings::dragEnterHandlers->erase(id);
|
||||
CppDOMBindings::RemoveDragEnterListener(ptr, id);
|
||||
}
|
||||
|
||||
std::int32_t AddDragLeaveListener(std::function<void(MouseEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::dragLeaveHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
dragLeaveHandlers.push_back(id);
|
||||
CppDOMBindings::dragLeaveHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddDragLeaveListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveDragLeaveListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
dragLeaveHandlers.erase(std::remove(dragLeaveHandlers.begin(), dragLeaveHandlers.end(), id), dragLeaveHandlers.end());
|
||||
CppDOMBindings::dragLeaveHandlers->erase(id);
|
||||
CppDOMBindings::RemoveDragLeaveListener(ptr, id);
|
||||
}
|
||||
|
|
@ -372,23 +394,116 @@ namespace Crafter {
|
|||
// Wheel Event
|
||||
std::int32_t AddWheelListener(std::function<void(WheelEvent)> callback) {
|
||||
std::int32_t id = CppDOMBindings::wheelHandlerMaxId++;
|
||||
handlers.push_back(id);
|
||||
wheelHandlers.push_back(id);
|
||||
CppDOMBindings::wheelHandlers->insert({id, callback});
|
||||
CppDOMBindings::AddWheelListener(ptr, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
void RemoveWheelListener(std::int32_t id) {
|
||||
handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end());
|
||||
wheelHandlers.erase(std::remove(wheelHandlers.begin(), wheelHandlers.end(), id), wheelHandlers.end());
|
||||
CppDOMBindings::wheelHandlers->erase(id);
|
||||
CppDOMBindings::RemoveWheelListener(ptr, id);
|
||||
}
|
||||
|
||||
~HtmlElement(){
|
||||
for(std::int32_t handler : handlers) {
|
||||
// Clean up all handlers by type
|
||||
for(std::int32_t handler : clickHandlers) {
|
||||
CppDOMBindings::clickHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveClickListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : mouseOverHandlers) {
|
||||
CppDOMBindings::mouseOverHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveMouseOverListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : mouseOutHandlers) {
|
||||
CppDOMBindings::mouseOutHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveMouseOutListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : mouseMoveHandlers) {
|
||||
CppDOMBindings::mouseMoveHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveMouseMoveListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : mouseDownHandlers) {
|
||||
CppDOMBindings::mouseDownHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveMouseDownListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : mouseUpHandlers) {
|
||||
CppDOMBindings::mouseUpHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveMouseUpListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : focusHandlers) {
|
||||
CppDOMBindings::focusHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveFocusListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : blurHandlers) {
|
||||
CppDOMBindings::blurHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveBlurListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : keyDownHandlers) {
|
||||
CppDOMBindings::keyDownHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveKeyDownListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : keyUpHandlers) {
|
||||
CppDOMBindings::keyUpHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveKeyUpListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : keyPressHandlers) {
|
||||
CppDOMBindings::keyPressHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveKeyPressListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : changeHandlers) {
|
||||
CppDOMBindings::changeHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveChangeListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : submitHandlers) {
|
||||
CppDOMBindings::submitHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveSubmitListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : inputHandlers) {
|
||||
CppDOMBindings::inputHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveInputListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : resizeHandlers) {
|
||||
CppDOMBindings::resizeHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveResizeListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : scrollHandlers) {
|
||||
CppDOMBindings::scrollHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveScrollListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : contextMenuHandlers) {
|
||||
CppDOMBindings::contextMenuHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveContextMenuListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : dragStartHandlers) {
|
||||
CppDOMBindings::dragStartHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveDragStartListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : dragEndHandlers) {
|
||||
CppDOMBindings::dragEndHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveDragEndListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : dropHandlers) {
|
||||
CppDOMBindings::dropHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveDropListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : dragOverHandlers) {
|
||||
CppDOMBindings::dragOverHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveDragOverListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : dragEnterHandlers) {
|
||||
CppDOMBindings::dragEnterHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveDragEnterListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : dragLeaveHandlers) {
|
||||
CppDOMBindings::dragLeaveHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveDragLeaveListener(ptr, handler);
|
||||
}
|
||||
for(std::int32_t handler : wheelHandlers) {
|
||||
CppDOMBindings::wheelHandlers->erase(handler);
|
||||
CppDOMBindings::RemoveWheelListener(ptr, handler);
|
||||
}
|
||||
CppDOMBindings::FreeJs(ptr);
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue