Code analysis fixes

marad · Aug 20, 2023 · 4232102 · 4232102
1 parent 8e5b738
commit 4232102
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/main/kotlin/gh/marad/tiler/config/internal/SimpleConfig.kt b/src/main/kotlin/gh/marad/tiler/config/internal/SimpleConfig.kt
@@ -7,7 +7,6 @@ import gh.marad.tiler.common.filteringrules.FilteringRules
 import gh.marad.tiler.common.filteringrules.Rule
 import gh.marad.tiler.common.layout.GapLayoutDecorator
 import gh.marad.tiler.common.layout.Layout
-import gh.marad.tiler.common.layout.MinWindowSizeLayoutDecorator
 import gh.marad.tiler.common.layout.TwoColumnLayout
 import gh.marad.tiler.config.ConfigFacade
 import gh.marad.tiler.config.Hotkey
@@ -36,7 +35,7 @@ class SimpleConfig : ConfigFacade {
     override fun reload() { }
 
     override fun createLayout(): Layout {
-        var layout = TwoColumnLayout(0.55f)
+        val layout = TwoColumnLayout(0.55f)
 //        layout = MinWindowSizeLayoutDecorator(1500, 800, twoColumnLayout)
         return GapLayoutDecorator(20, layout)
     }

diff --git a/src/main/kotlin/gh/marad/tiler/os/internal/WindowsOs.kt b/src/main/kotlin/gh/marad/tiler/os/internal/WindowsOs.kt
@@ -1,11 +1,9 @@
 package gh.marad.tiler.os.internal
 
-import com.sun.jna.Native
 import com.sun.jna.platform.win32.User32
 import com.sun.jna.platform.win32.WinDef
 import com.sun.jna.platform.win32.WinDef.RECT
 import com.sun.jna.platform.win32.WinUser.WINDOWPLACEMENT
-import com.sun.jna.win32.W32APIOptions
 import gh.marad.tiler.common.*
 import gh.marad.tiler.common.Window
 import gh.marad.tiler.os.OsFacade
@@ -15,7 +13,7 @@ import gh.marad.tiler.os.internal.winapi.Window as OsWindow
 
 class WindowsOs : OsFacade {
     private val hotkeys = Hotkeys()
-    private val myU32 = Native.load("user32", MyUser32::class.java, W32APIOptions.DEFAULT_OPTIONS)
+//    private val myU32 = Native.load("user32", MyUser32::class.java, W32APIOptions.DEFAULT_OPTIONS)
 
     override fun getDesktopState(): DesktopState {
         val monitors = Monitors.list().map { Monitor(it.workArea.toLayoutSpace(), it.isPrimary) }
@@ -90,7 +88,7 @@ class WindowsOs : OsFacade {
     }
 
     override fun execute(commands: List<TilerCommand>) {
-        var deferStruct = myU32.BeginDeferWindowPos(commands.count { it is SetWindowPosition })
+//        var deferStruct = myU32.BeginDeferWindowPos(commands.count { it is SetWindowPosition })
         commands.forEach {
 //            if (it is SetWindowPosition) {
 //                val hwnd = (it.windowId as WID).handle
@@ -103,8 +101,8 @@ class WindowsOs : OsFacade {
                 execute(it)
 //            }
         }
-        Thread.sleep(50)
-        myU32.EndDeferWindowPos(deferStruct)
+//        Thread.sleep(50)
+//        myU32.EndDeferWindowPos(deferStruct)
     }
 
     override fun startEventHandling(handler: WindowEventHandler) {