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