@@ -370,11 +370,12 @@ void ProcessEvent(const sf::Window& window, const sf::Event& event)
370
370
{
371
371
if (const auto * resized = event.getIf <sf::Event::Resized>())
372
372
{
373
- io.DisplaySize = ImVec2 ( static_cast < float > (resized->size . x ), static_cast < float >(resized-> size . y ));
373
+ io.DisplaySize = toImVec2 ( sf::Vector2f (resized->size ));
374
374
}
375
375
else if (const auto * mouseMoved = event.getIf <sf::Event::MouseMoved>())
376
376
{
377
- io.AddMousePosEvent (static_cast <float >(mouseMoved->position .x ), static_cast <float >(mouseMoved->position .y ));
377
+ const auto [x, y] = sf::Vector2f (mouseMoved->position );
378
+ io.AddMousePosEvent (x, y);
378
379
s_currWindowCtx->mouseMoved = true ;
379
380
}
380
381
else if (const auto * mouseButtonPressed = event.getIf <sf::Event::MouseButtonPressed>())
@@ -518,12 +519,11 @@ void Update(const sf::Vector2i& mousePos, const sf::Vector2f& displaySize, sf::T
518
519
{
519
520
if (io.WantSetMousePos )
520
521
{
521
- const sf::Vector2i newMousePos (static_cast <int >(io.MousePos .x ), static_cast <int >(io.MousePos .y ));
522
- sf::Mouse::setPosition (newMousePos);
522
+ sf::Mouse::setPosition (sf::Vector2i (toSfVector2f (io.MousePos )));
523
523
}
524
524
else
525
525
{
526
- io.MousePos = ImVec2 ( static_cast < float > (mousePos. x ), static_cast < float >(mousePos. y ));
526
+ io.MousePos = toImVec2 ( sf::Vector2f (mousePos));
527
527
}
528
528
for (unsigned int i = 0 ; i < 3 ; i++)
529
529
{
@@ -637,7 +637,7 @@ bool UpdateFontTexture()
637
637
io.Fonts ->GetTexDataAsRGBA32 (&pixels, &width, &height);
638
638
639
639
sf::Texture newTexture;
640
- if (!newTexture.resize ({ static_cast < unsigned >( width), static_cast < unsigned >( height)} ))
640
+ if (!newTexture.resize (sf::Vector2u ( sf::Vector2 ( width, height)) ))
641
641
{
642
642
return false ;
643
643
}
0 commit comments