Catcrafts/Crafter.Graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Jorijn van der Graaf 2025-12-29 22:21:22 +01:00
commit d26d71ec91
5 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
implementations/Crafter.Graphics-GridElement.cpp
View file

@ -41,6 +41,7 @@ void GridElement::UpdatePositionScaled(Window& window) {
// Calculate position for this child // Calculate position for this child
std::int_fast32_t childX = (cellWidth * col) + (spacingX * col) + paddingX; std::int_fast32_t childX = (cellWidth * col) + (spacingX * col) + paddingX;
std::int_fast32_t childY = (cellHeight * row) + (spacingY * row) + paddingY; std::int_fast32_t childY = (cellHeight * row) + (spacingY * row) + paddingY;
// Apply relative positioning // Apply relative positioning

4
implementations/Crafter.Graphics-MouseElement.cpp
View file

@ -39,6 +39,10 @@ MouseElement::MouseElement(WindowMouse& window) : Transform({FractionalToMapped(
window.mouseElements.push_back(this); window.mouseElements.push_back(this);
} }
MouseElement::MouseElement() : Transform({FractionalToMapped(0), FractionalToMapped(0), FractionalToMapped(1), FractionalToMapped(1), FractionalToMapped(0), FractionalToMapped(0), 0}) {
}
void MouseElement::UpdatePosition(Window& window) { void MouseElement::UpdatePosition(Window& window) {
window.ScaleMouse(*this); window.ScaleMouse(*this);

2
implementations/Crafter.Graphics-Window_wayland.cpp
View file

@ -522,6 +522,8 @@ void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::
} }
} }
window->mouseElements.erase(std::remove(window->mouseElements.begin(), window->mouseElements.end(), static_cast<MouseElement*>(nullptr)), window->mouseElements.end()); window->mouseElements.erase(std::remove(window->mouseElements.begin(), window->mouseElements.end(), static_cast<MouseElement*>(nullptr)), window->mouseElements.end());
window->mouseElements.insert(window->mouseElements.end(), window->pendingMouseElements.begin(), window->pendingMouseElements.end());
window->pendingMouseElements.clear();
} }
void WindowWayland::PointerListenerHandleMotion(void* data, wl_pointer* wl_pointer, uint time, wl_fixed_t surface_x, wl_fixed_t surface_y) { void WindowWayland::PointerListenerHandleMotion(void* data, wl_pointer* wl_pointer, uint time, wl_fixed_t surface_x, wl_fixed_t surface_y) {

1
interfaces/Crafter.Graphics-MouseElement.cppm
View file

@ -38,6 +38,7 @@ export namespace Crafter {
Event<MousePoint> onMouseRightRelease; Event<MousePoint> onMouseRightRelease;
Event<MousePoint> onMouseLeftRelease; Event<MousePoint> onMouseLeftRelease;
MouseElement();
MouseElement(WindowMouse& window); MouseElement(WindowMouse& window);
MouseElement(Anchor anchor); MouseElement(Anchor anchor);
MouseElement(Anchor anchor, WindowMouse& window); MouseElement(Anchor anchor, WindowMouse& window);

1
interfaces/Crafter.Graphics-Window.cppm
View file

@ -117,6 +117,7 @@ export namespace Crafter {
bool mouseLeftHeld = false; bool mouseLeftHeld = false;
bool mouseRightHeld = false; bool mouseRightHeld = false;
std::vector<MouseElement*> mouseElements; std::vector<MouseElement*> mouseElements;
std::vector<MouseElement*> pendingMouseElements;
}; };
class WindowTitle { class WindowTitle {