Merge branch 'master' of https://github.com/Crypton33/otclient

2015-12-15 03:26:43 +02:00 · 2015-12-15 03:26:43 +02:00 · 39d4a7d842
parent 37f563d3d5 af0819f454
commit 39d4a7d842
2 changed files with 7 additions and 0 deletions
--- a/modules/game_minimap/minimap.otui
+++ b/modules/game_minimap/minimap.otui
@ -20,3 +20,9 @@ MiniWindow
    Minimap
      id: minimap
      anchors.fill: parent
+
+  ResizeBorder
+    anchors.right: parent.right
+    anchors.top: parent.top
+    anchors.bottom: parent.bottom
+    enabled: true
--- a/modules/game_ruleviolation/ruleviolation.lua
+++ b/modules/game_ruleviolation/ruleviolation.lua
@ -90,6 +90,7 @@ function show(target, statement)
    ruleViolationWindow:show()
    ruleViolationWindow:raise()
    ruleViolationWindow:focus()
+    ruleViolationWindow:getChildById('commentText'):focus()
  end
 end