Many UI fixes.

modules/game_battle/battle.lua

@@ -49,7 +49,7 @@ function init()
   mouseWidget:setVisible(false)
   mouseWidget:setFocusable(false)
 
-  battleWindow:setContentMinimumHeight(56)
+  battleWindow:setContentMinimumHeight(80)
   battleWindow:setContentMaximumHeight(384)
 
   connect(Creature, { onSkullChange = checkCreatureSkull,

modules/game_battle/battle.otui

@@ -44,58 +44,58 @@ MiniWindow
   @onClose: modules.game_battle.onMiniWindowClose()
   &save: true
 
-  BattlePlayers
-    id: hidePlayers
-    !tooltip: tr('Hide players')
-    anchors.top: parent.top
-    anchors.right: next.left
-    margin-right: 5
+  Panel
     margin-top: 26
-    @onCheckChange: modules.game_battle.checkCreatures()
-
-  BattleNPCs
-    id: hideNPCs
-    !tooltip: tr('Hide Npcs')
     anchors.top: parent.top
-    anchors.right: next.left
-    margin-right: 5
-    margin-top: 26
-    @onCheckChange: modules.game_battle.checkCreatures()
+    anchors.left: parent.left
+    anchors.right: miniwindowScrollBar.left
+    height: 20
 
-  BattleMonsters
-    id: hideMonsters
-    !tooltip: tr('Hide monsters')
-    anchors.top: parent.top
-    anchors.horizontalCenter: parent.horizontalCenter
-    margin-top: 26
-    @onCheckChange: modules.game_battle.checkCreatures()
+    Panel
+      anchors.top: parent.top
+      anchors.horizontalCenter: parent.horizontalCenter
+      height: 20
+      width: 120
+      // width*count + spacing*(count-1)
+      layout:
+        type: horizontalBox
+        spacing: 5
 
-  BattleSkulls
-    id: hideSkulls
-    !tooltip: tr('Hide non-skull players')
-    anchors.top: prev.top
-    anchors.left: prev.right
-    margin-left: 5
-    @onCheckChange: modules.game_battle.checkCreatures()
+      BattlePlayers
+        id: hidePlayers
+        !tooltip: tr('Hide players')
+        @onCheckChange: modules.game_battle.checkCreatures()
 
-  BattleParty
-    id: hideParty
-    !tooltip: tr('Hide party members')
-    anchors.top: prev.top
-    anchors.left: prev.right
-    margin-left: 5
-    phantom: true
-    @onCheckChange: modules.game_battle.checkCreatures()
+      BattleNPCs
+        id: hideNPCs
+        !tooltip: tr('Hide Npcs')
+        @onCheckChange: modules.game_battle.checkCreatures()
+
+      BattleMonsters
+        id: hideMonsters
+        !tooltip: tr('Hide monsters')
+        @onCheckChange: modules.game_battle.checkCreatures()
+
+      BattleSkulls
+        id: hideSkulls
+        !tooltip: tr('Hide non-skull players')
+        @onCheckChange: modules.game_battle.checkCreatures()
+
+      BattleParty
+        id: hideParty
+        !tooltip: tr('Hide party members')
+        @onCheckChange: modules.game_battle.checkCreatures()
 
   HorizontalSeparator
     anchors.top: prev.bottom
     anchors.left: parent.left
-    anchors.right: parent.right
-    margin-top: 5
+    anchors.right: miniwindowScrollBar.left
+    margin-right: 1
+    margin-top: 4
 
   MiniWindowContents
-    anchors.top: parent.top
-    margin-top: 50
+    anchors.top: prev.bottom
+    margin-top: 0
 
     Panel
       id: battlePanel