update hitboxes of some buttons

Author: DeDiamondPro

src/main/kotlin/dev/dediamondpro/resourcify/elements/Paginator.kt

@@ -22,36 +22,62 @@ import dev.dediamondpro.resourcify.gui.data.Colors
 import dev.dediamondpro.resourcify.gui.data.Icons
 import dev.dediamondpro.resourcify.util.localize
 import gg.essential.elementa.components.UIBlock
+import gg.essential.elementa.components.UIContainer
 import gg.essential.elementa.components.UIText
 import gg.essential.elementa.constraints.CenterConstraint
 import gg.essential.elementa.dsl.*
 import gg.essential.universal.UScreen
 
 class Paginator(screen: PaginatedScreen) : UIBlock(Colors.BACKGROUND) {
     init {
+        constrain {
+            width = 160.pixels()
+            height = 29.pixels()
+        }
+
+        val backHitBox = UIContainer().constrain {
+            x = 3.pixels()
+            y = CenterConstraint()
+            width = 19.pixels()
+            height = 19.pixels()
+        }.onMouseClick { screen.goBack() } childOf this
         Icon(Icons.BACK, true, basicColorConstraint {
             if (PaginatedScreen.backScreens.isEmpty()) Colors.TEXT_SECONDARY else Colors.TEXT_PRIMARY
         }).constrain {
-            x = 8.pixels()
+            x = 5.pixels()
             y = CenterConstraint()
             width = 9.pixels()
             height = 9.pixels()
-        }.onMouseClick { screen.goBack() } childOf this
-        UIText("resourcify.screens.close".localize()).constrain {
+        } childOf backHitBox
+
+        val closeHitBox = UIContainer().constrain {
             x = CenterConstraint()
             y = CenterConstraint()
-            color = Colors.TEXT_PRIMARY.toConstraint()
+            width = 50.pixels()
+            height = 19.pixels()
         }.onMouseClick {
             UScreen.displayScreen(PaginatedScreen.backScreens.findLast { it !is PaginatedScreen })
             PaginatedScreen.cleanUp()
         } childOf this
+        UIText("resourcify.screens.close".localize()).constrain {
+            x = CenterConstraint()
+            y = CenterConstraint()
+            color = Colors.TEXT_PRIMARY.toConstraint()
+        } childOf closeHitBox
+
+        val forwardHitBox = UIContainer().constrain {
+            x = 3.pixels(true)
+            y = CenterConstraint()
+            width = 19.pixels()
+            height = 19.pixels()
+        }.onMouseClick { screen.goForward() } childOf this
         Icon(Icons.FORWARD, true, basicColorConstraint {
             if (PaginatedScreen.forwardScreens.isEmpty()) Colors.TEXT_SECONDARY else Colors.TEXT_PRIMARY
         }).constrain {
-            x = 8.pixels(true)
+            x = 5.pixels(true)
             y = CenterConstraint()
             width = 9.pixels()
             height = 9.pixels()
-        }.onMouseClick { screen.goForward() } childOf this
+        } childOf forwardHitBox
     }
 }

src/main/kotlin/dev/dediamondpro/resourcify/gui/browsepage/BrowseScreen.kt

@@ -314,20 +314,25 @@ class BrowseScreen(
             }
         }
 
+        val searchBoxHitBox = UIContainer().constrain {
+            x = 6.pixels()
+            y = CenterConstraint()
+            height = 19.pixels()
+            width = 100.percent() - 111.pixels()
+        }.onMouseClick {
+            if (it.mouseButton != 0) return@onMouseClick
+            searchBox.grabWindowFocus()
+        } childOf headerBox
         searchBox = (UITextInput(
             "resourcify.browse.search".localize(type.displayName.localize()),
             cursorColor = Colors.TEXT_PRIMARY
         ).constrain {
-            x = 6.pixels()
             y = CenterConstraint()
-            width = 100.percent() - 89.pixels()
+            width = 100.percent()
             color = Colors.TEXT_PRIMARY.toConstraint()
         }.onUpdate {
             loadPacks()
-        }.onMouseClick {
-            if (it.mouseButton != 0) return@onMouseClick
-            grabWindowFocus()
-        } childOf headerBox) as UITextInput
+        } childOf searchBoxHitBox) as UITextInput
 
         // Settings button
         Icon(Icons.SETTINGS, true, Colors.TEXT_SECONDARY).constrain {

src/main/kotlin/dev/dediamondpro/resourcify/gui/projectpage/ProjectScreen.kt

@@ -173,11 +173,12 @@ class ProjectScreen(
         if (project.hasGallery()) pages["resourcify.project.gallery".localize()] = ::GalleryPage
         pages["resourcify.project.versions".localize()] = ::VersionsPage
         pages.forEach { (text, page) ->
-            UIText("${ChatColor.BOLD}$text").constrain {
+            val hitBox = UIContainer().constrain {
                 x = if (text == "resourcify.project.description".localize()) 6.pixels()
                 else SiblingConstraint(padding = 8f)
                 y = CenterConstraint()
-                color = Colors.TEXT_PRIMARY.toConstraint()
+                width = ChildBasedSizeConstraint()
+                height = 19.pixels()
             }.onMouseClick {
                 if (page == currentPage || it.mouseButton != 0) return@onMouseClick
                 currentPage = page
@@ -186,20 +187,30 @@ class ProjectScreen(
                     page(this@ProjectScreen) childOf mainBox
                 }.unhide()
             } childOf navigationBox
+
+            UIText("${ChatColor.BOLD}$text").constrain {
+                y = CenterConstraint()
+                color = Colors.TEXT_PRIMARY.toConstraint()
+            } childOf hitBox
         }
+        val sourceHitbox = UIContainer().constrain {
+            x = SiblingConstraint(padding = 8f)
+            y = CenterConstraint()
+            width = ChildBasedSizeConstraint()
+            height = 19.pixels()
+        }.onMouseClick {
+            if (it.mouseButton != 0) return@onMouseClick
+            UDesktop.browse(URI(project.getBrowserUrl()))
+        } childOf navigationBox
         TextIcon(
             "${ChatColor.BOLD}${service.getName().localize()}",
             Icons.EXTERNAL_LINK,
             color = Colors.TEXT_PRIMARY.toConstraint()
         ).constrain {
-            x = SiblingConstraint(padding = 8f)
             y = CenterConstraint()
             width = ChildLocationSizeConstraint()
             height = ChildBasedMaxSizeConstraint()
-        }.onMouseClick {
-            if (it.mouseButton != 0) return@onMouseClick
-            UDesktop.browse(URI(project.getBrowserUrl()))
-        } childOf navigationBox
+        } childOf sourceHitbox
     }
 
     private fun sideBar() {