Save miniwindows states

modules/corelib/widgets/uiminiwindow.lua

@@ -5,9 +5,102 @@ function UIMiniWindow.create()
   return miniwindow
 end
 
+function UIMiniWindow:getClassName()
+  return 'UIMiniWindow'
+end
+
+function UIMiniWindow:open(dontSave)
+  self:setVisible(true)
+
+  if not dontSave then
+    self:setSettings({closed = false})
+  end
+
+  signalcall(self.onOpen, self)
+end
+
+function UIMiniWindow:close(dontSave)
+  self:setVisible(false)
+
+  if not dontSave then
+    self:setSettings({closed = true})
+  end
+
+  signalcall(self.onClose, self)
+end
+
+function UIMiniWindow:minimize(dontSave)
+  self:setOn(true)
+  self:getChildById('contentsPanel'):hide()
+  self:getChildById('miniwindowScrollBar'):hide()
+  self:getChildById('bottomResizeBorder'):hide()
+  self:getChildById('minimizeButton'):setOn(true)
+  self.savedHeight = self:getHeight()
+  self:setHeight(self.minimizedHeight)
+
+  if not dontSave then
+    self:setSettings({minimized = true})
+  end
+
+  signalcall(self.onMinimize, self)
+end
+
+function UIMiniWindow:maximize(dontSave)
+  self:setOn(false)
+  self:getChildById('contentsPanel'):show()
+  self:getChildById('miniwindowScrollBar'):show()
+  self:getChildById('bottomResizeBorder'):show()
+  self:getChildById('minimizeButton'):setOn(false)
+  self:setHeight(self.savedHeight)
+
+  if not dontSave then
+    self:setSettings({minimized = false})
+  end
+
+  signalcall(self.onMaximize, self)
+end
+
 function UIMiniWindow:onSetup()
-  self:getChildById('closeButton').onClick = function() signalcall(self.onClose, self) end
-  self:getChildById('minimizeButton').onClick = function() signalcall(self.onMinimize, self) end
+  self:getChildById('closeButton').onClick =
+    function()
+      self:close()
+    end
+
+  self:getChildById('minimizeButton').onClick =
+    function()
+      if self:isOn() then
+        self:maximize()
+      else
+        self:minimize()
+      end
+    end
+
+  local settings = Settings.getNode('MiniWindows')
+  if settings then
+    local selfSettings = settings[self:getId()]
+    if selfSettings then
+      if selfSettings.parentId then
+        local parent = rootWidget:recursiveGetChildById(selfSettings.parentId)
+        if parent then
+          if parent:getClassName() == 'UIMiniWindowContainer' and selfSettings.index and parent:isOn() then
+            parent:scheduleInsert(self, selfSettings.index)
+          elseif selfSettings.position then
+            self:setParent(parent)
+            self:setPosition(topoint(selfSettings.position))
+            self:bindRectToParent()
+          end
+        end
+      end
+
+      if selfSettings.minimized then
+        self:minimize(true)
+      end
+
+      if selfSettings.closed then
+        self:close(true)
+      end
+    end
+  end
 end
 
 function UIMiniWindow:onDragEnter(mousePos)
@@ -18,6 +111,7 @@ function UIMiniWindow:onDragEnter(mousePos)
     local containerParent = parent:getParent()
     parent:removeChild(self)
     containerParent:addChild(self)
+    parent:saveChildren()
   end
 
   local oldPos = self:getPosition()
@@ -84,6 +178,15 @@ function UIMiniWindow:onDragLeave(droppedWidget, mousePos)
     self.setMovedChildMargin = nil
     self.movedIndex = nil
   end
+
+  local parent = self:getParent()
+  if parent then
+    if parent:getClassName() == 'UIMiniWindowContainer' then
+      parent:saveChildren()
+    else
+      self:saveParentPosition(parent:getId(), self:getPosition())
+    end
+  end
 end
 
 function UIMiniWindow:onFocusChange(focused)
@@ -95,28 +198,34 @@ function UIMiniWindow:onFocusChange(focused)
   end
 end
 
-function UIMiniWindow:onClose()
-end
-
-function UIMiniWindow:onMinimize()
-  if self:isOn() then
-    self:setOn(false)
-    self:getChildById('contentsPanel'):show()
-    self:getChildById('miniwindowScrollBar'):show()
-    self:getChildById('bottomResizeBorder'):show()
-    self:getChildById('minimizeButton'):setOn(false)
-    self:setHeight(self.savedHeight)
-  else
-    self.savedHeight = self:getHeight()
-    self:setHeight(self.minimizedHeight)
-    self:setOn(true)
-    self:getChildById('contentsPanel'):hide()
-    self:getChildById('miniwindowScrollBar'):hide()
-    self:getChildById('bottomResizeBorder'):hide()
-    self:getChildById('minimizeButton'):setOn(true)
+function UIMiniWindow:setSettings(data)
+  local settings = Settings.getNode('MiniWindows')
+  if not settings then
+    settings = {}
   end
+
+  local id = self:getId()
+  if not settings[id] then
+    settings[id] = {}
+  end
+
+  for key,value in pairs(data) do
+    settings[id][key] = value
+  end
+
+  Settings.setNode('MiniWindows', settings)
 end
 
-function UIMiniWindow:getClassName()
-  return 'UIMiniWindow'
+function UIMiniWindow:saveParentPosition(parentId, position)
+  local selfSettings = {}
+  selfSettings.parentId = parentId
+  selfSettings.position = pointtostring(position)
+  self:setSettings(selfSettings)
+end
+
+function UIMiniWindow:saveParentIndex(parentId, index)
+  local selfSettings = {}
+  selfSettings.parentId = parentId
+  selfSettings.index = index
+  self:setSettings(selfSettings)
 end

modules/corelib/widgets/uiminiwindowcontainer.lua

@@ -2,6 +2,7 @@ UIMiniWindowContainer = extends(UIWidget)
 
 function UIMiniWindowContainer.create()
   local container = UIMiniWindowContainer.internalCreate()
+  container.scheduledWidgets = {}
   container:setFocusable(false)
   container:setPhantom(true)
   return container
@@ -14,7 +15,9 @@ function UIMiniWindowContainer:onDrop(widget, mousePos)
   		return true
   	end
 
-  	oldParent:removeChild(widget)
+    if oldParent then
+  	  oldParent:removeChild(widget)
+    end
 
   	if widget.movedWidget then
   		local index = self:getChildIndex(widget.movedWidget)
@@ -27,6 +30,56 @@ function UIMiniWindowContainer:onDrop(widget, mousePos)
   end
 end
 
+function UIMiniWindowContainer:swapInsert(widget, index)
+  local oldParent = widget:getParent()
+  local oldIndex = self:getChildIndex(widget)
+
+  if oldParent == self and oldIndex ~= index then
+    local oldWidget = self:getChildByIndex(index)
+    self:removeChild(oldWidget)
+    self:insertChild(oldIndex, oldWidget)
+    self:removeChild(widget)
+    self:insertChild(index, widget)
+  end
+end
+
+function UIMiniWindowContainer:scheduleInsert(widget, index)
+  if index - 1 > self:getChildCount() then
+    if self.scheduledWidgets[index] then
+      warning('replacing scheduled widget id ' .. widget:getId())
+    end
+    self.scheduledWidgets[index] = widget
+  else
+    local oldParent = widget:getParent()
+    if oldParent ~= self then
+      oldParent:removeChild(widget)
+      self:insertChild(index, widget)
+    else
+      self:swapInsert(widget, index)
+    end
+
+    while true do
+      local placed = false
+      for nIndex,nWidget in pairs(self.scheduledWidgets) do
+        if nIndex - 1 <= self:getChildCount() then
+          self:insertChild(nIndex, nWidget)
+          self.scheduledWidgets[nIndex] = nil
+          placed = true
+          break
+        end
+      end
+      if not placed then break end
+    end
+  end
+end
+
+function UIMiniWindowContainer:saveChildren()
+  local children = self:getChildren()
+  for i=1,#children do
+    children[i]:saveParentIndex(self:getId(), i)
+  end
+end
+
 function UIMiniWindowContainer:getClassName()
   return 'UIMiniWindowContainer'
 end

modules/corelib/widgets/uiresizeborder.lua

@@ -80,12 +80,24 @@ function UIResizeBorder:onStyleApply(styleName, styleNode)
   end
 end
 
+function UIResizeBorder:onVisibilityChange(visible)
+  if visible and self.maximum == self.minimum then
+    self:hide()
+  end
+end
+
 function UIResizeBorder:setMaximum(maximum)
   self.maximum  = maximum
+  if self.maximum == self.minimum then
+    self:hide()
+  end
 end
 
 function UIResizeBorder:setMinimum(minimum)
   self.minimum = minimum
+  if self.maximum == self.minimum then
+    self:hide()
+  end
 end
 
 function UIResizeBorder:getMaximum() return self.maximum end