Merge branch 'master' into be

Author: BalaM314

arc-core/src/arc/scene/ui/Dialog.java

@@ -529,11 +529,11 @@ public void hide(Action action){
         Scene stage = getScene();
         if(stage != null){
             removeListener(focusListener);
-            if(previousKeyboardFocus != null && previousKeyboardFocus.getScene() == null) previousKeyboardFocus = null;
+            if(previousKeyboardFocus != null && (previousKeyboardFocus.getScene() == null || !previousKeyboardFocus.visible)) previousKeyboardFocus = null;
             Element actor = stage.getKeyboardFocus();
             if(actor == null || actor.isDescendantOf(this)) stage.setKeyboardFocus(previousKeyboardFocus);
 
-            if(previousScrollFocus != null && previousScrollFocus.getScene() == null) previousScrollFocus = null;
+            if(previousScrollFocus != null && (previousScrollFocus.getScene() == null || !previousScrollFocus.visible)) previousScrollFocus = null;
             actor = stage.getScrollFocus();
             if(actor == null || actor.isDescendantOf(this)) stage.setScrollFocus(previousScrollFocus);
         }

backends/backend-sdl3/src/arc/backend/sdl/SdlApplication.java

@@ -185,13 +185,20 @@ private void init(){
             SDLVideo.SDL_GL_SetSwapInterval(1);
         }
 
+        SDLVideo.SDL_ShowWindow(window);
+
         String ver = SDLVersion.SDL_GetRevision();
 
         Log.info("[Core] Initialized @", ver);
     }
 
     private void loop(){
 
+        //might be necessary for the window to show up on Wayland
+        if(OS.isLinux){
+            SDLVideo.SDL_GL_SwapWindow(window);
+        }
+
         graphics.updateSize(config.width, config.height);
         listen(ApplicationListener::init);
         try(MemoryStack stack = MemoryStack.stackPush()){
@@ -222,6 +229,7 @@ private void loop(){
                         case SDLEvents.SDL_EVENT_DROP_FILE:
                             Fi file = new Fi(event.drop().dataString());
                             listen(l -> l.fileDropped(file));
+                            break;
 
                         default:
                             input.handleInput(event);
@@ -240,8 +248,6 @@ private void loop(){
                 input.postUpdate();
             }
         }
-
-
     }
 
     private void listen(Cons<ApplicationListener> cons){

backends/backend-sdl3/src/arc/backend/sdl/SdlGraphics.java

@@ -61,6 +61,11 @@ public class SdlGraphics extends Graphics{
             Core.gl = Core.gl20 = gl20 = Core.gl30 = gl30 = new SdlGL30();
         }
 
+        //disable GL_FRAMEBUFFER_SRGB https://github.com/libsdl-org/SDL/issues/14898
+        if(caps.GL_ARB_framebuffer_sRGB || caps.GL_EXT_framebuffer_sRGB || glVersion.atLeast(3, 0)){
+            Core.gl.glDisable(0x8DB9);
+        }
+
         clear(app.config.initialBackgroundColor);
         SDLVideo.SDL_GL_SwapWindow(app.window);
     }

backends/backend-sdl3/src/arc/backend/sdl/SdlInput.java

@@ -79,9 +79,7 @@ void handleInput(SDL_Event event){
             }
 
         }else if(type == SDLEvents.SDL_EVENT_MOUSE_WHEEL){
-            int sx = (int)event.wheel().x();
-            int sy = (int)event.wheel().y();
-            queue.scrolled(-sx, -sy);
+            queue.scrolled(-event.wheel().x(), -event.wheel().y());
         }else if(type == SDLEvents.SDL_EVENT_TEXT_INPUT){
             String text = event.text().textString();
             if(text != null){

build.gradle

@@ -11,7 +11,7 @@ versions.robovm = "2.3.24"
 versions.junit = "4.11"
 //TODO: upgrade to 3.1.1 and finally get rid of the disease that is ant
 versions.jnigen = "2.5.1"
-versions.lwjgl = "3.4.0"
+versions.lwjgl = "3.4.1"
 
 libraries.robovm = [
     "com.mobidevelop.robovm:robovm-rt:${versions.robovm}",