Save graphics options

modules/client_options/graphics.otui

@@ -1,3 +1,12 @@
+FrameRateScrollbar < HorizontalScrollBar
+  step: 1
+  @onValueChange: Options.setOption(self:getId(), self:getValue())
+  @onSetup: |
+    UIScrollBar.onSetup(self)
+    local value = Options.getOption(self:getId())
+    if value == 0 then value = self:getMaximum() end
+    self:setValue(value)
+
 Panel
   Label
     !text: tr('Graphics Engine:')
@@ -34,60 +43,51 @@ Panel
     !text: tr('Fullscreen')
 
   Label
-    id: backgroundFrameRateLimitLabel
+    id: backgroundFrameRateLabel
     !text: tr('Game framerate limit: %s', 'max')
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.top: prev.bottom
     margin-top: 6
+    @onSetup: |
+      local value = Options.getOption('backgroundFrameRate')
+      local text = value
+      if value <= 0 or value >= 201 then
+        text = 'max'
+      end
 
-  HorizontalScrollBar
+      self:setText(tr('Game framerate limit: %s', text))
-    id: backgroundFrameRateScrollBar
+
+  FrameRateScrollbar
+    id: backgroundFrameRate
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.top: prev.bottom
     margin-top: 3
     minimum: 10
     maximum: 201
-    value: 201
-    step: 1
-    @onValueChange: |
-      local value = self:getValue()
-      local text = value
-      if value == self:getMaximum() then
-        text = 'max'
-        value = 0
-      end
-
-      self:getParent():getChildById('backgroundFrameRateLimitLabel'):setText(tr('Game framerate limit: %s', text))
-      g_app.setBackgroundPaneMaxFps(value)
 
   Label
-    id: foregroundFrameRateLimitLabel
+    id: foregroundFrameRateLabel
-    !text: tr('Interface framerate limit: %s', '24')
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.top: prev.bottom
     margin-top: 6
+    @onSetup: |
+      local value = Options.getOption('foregroundFrameRate')
+      local text = value
+      if value <= 0 or value >= 61 then
+        text = 'max'
+      end
 
-  HorizontalScrollBar
+      self:setText(tr('Interface framerate limit: %s', text))
-    id: foregroundFrameRateScrollBar
+
+  FrameRateScrollbar
+    id: foregroundFrameRate
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.top: prev.bottom
     margin-top: 3
     minimum: 1
     maximum: 61
-    value: 61
-    step: 1
-    @onValueChange: |
-      local value = self:getValue()
-      local text = value
-      if value == self:getMaximum() then
-        text = 'max'
-        value = 0
-      end
-
-      self:getParent():getChildById('foregroundFrameRateLimitLabel'):setText(tr('Interface framerate limit: %s', text))
-      g_app.setForegroundPaneMaxFps(value)
 

modules/client_options/options.lua

@@ -1,21 +1,28 @@
 Options = {}
 
+local defaultOptions = {
+  vsync = false,
+  showfps = true,
+  fullscreen = false,
+  classicControl = false,
+  showStatusMessagesInConsole = true,
+  showEventMessagesInConsole = true,
+  showInfoMessagesInConsole = true,
+  showTimestampsInConsole = true,
+  showLevelsInConsole = true,
+  showPrivateMessagesInConsole = false,
+  showPrivateMessagesOnScreen = true,
+  enableMusic = true,
+  showLeftPanel = false,
+  foregroundFrameRate = 61,
+  backgroundFrameRate = 201,
+  painterEngine = 0
+}
+
 local optionsWindow
 local optionsButton
 local optionsTabBar
-local options = { vsync = false,
+local options = {}
-                  showfps = true,
-                  fullscreen = false,
-                  classicControl = false,
-                  showStatusMessagesInConsole = true,
-                  showEventMessagesInConsole = true,
-                  showInfoMessagesInConsole = true,
-                  showTimestampsInConsole = true,
-                  showLevelsInConsole = true,
-                  showPrivateMessagesInConsole = false,
-                  showPrivateMessagesOnScreen = true,
-                  enableMusic = true,
-                  showLeftPanel = false }
 local generalPanel
 local graphicsPanel
 
@@ -37,27 +44,26 @@ local function setupGraphicsEngines()
 
   enginesRadioGroup.onSelectionChange = function(self, selected)
     if selected == ogl1 then
-      g_graphics.selectPainterEngine(1)
+      Options.setOption('painterEngine', 1)
     elseif selected == ogl2 then
-      g_graphics.selectPainterEngine(2)
+      Options.setOption('painterEngine', 2)
     end
   end
 
-  local foregroundFrameRateScrollBar = graphicsPanel:getChildById('foregroundFrameRateScrollBar')
-  local foregroundFrameRateLimitLabel = graphicsPanel:getChildById('foregroundFrameRateLimitLabel')
   if not g_graphics.canCacheBackbuffer() then
-    foregroundFrameRateScrollBar:setValue(61)
+    graphicsPanel:getChildById('foregroundFrameRateScrollBar'):disable()
-    foregroundFrameRateScrollBar:disable()
+    graphicsPanel:getChildById('foregroundFrameRateLimitLabel'):disable()
-    foregroundFrameRateLimitLabel:disable()
   end
 end
 
 function Options.init()
   -- load options
-  for k,v in pairs(options) do
+  for k,v in pairs(defaultOptions) do
+    g_settings.setDefault(k, v)
     if type(v) == 'boolean' then
-      g_settings.setDefault(k, v)
       Options.setOption(k, g_settings.getBoolean(k))
+    elseif type(v) == 'number' then
+      Options.setOption(k, g_settings.getNumber(k))
     end
   end
 
@@ -115,6 +121,7 @@ function Options.toggleOption(key)
 end
 
 function Options.setOption(key, value)
+  if options[key] == value then return end
   if key == 'vsync' then
     g_window.setVerticalSync(value)
   elseif key == 'showfps' then
@@ -123,17 +130,33 @@ function Options.setOption(key, value)
       if frameCounter then frameCounter:setVisible(value) end
     end)
   elseif key == 'fullscreen' then
-    addEvent(function()
+    g_window.setFullscreen(value)
-      g_window.setFullscreen(value)
-    end)
   elseif key == 'enableMusic' then
-    addEvent(function()
+    g_sounds.enableMusic(value)
-      g_sounds.enableMusic(value)
-    end)
   elseif key == 'showLeftPanel' then
     addEvent(function()
       GameInterface.getLeftPanel():setOn(value)
     end)
+  elseif key == 'backgroundFrameRate' then
+    local text = value
+    if value <= 0 or value >= 201 then
+      text = 'max'
+      value = 0
+    end
+
+    if graphicsPanel then graphicsPanel:getChildById('backgroundFrameRateLabel'):setText(tr('Game framerate limit: %s', text)) end
+    g_app.setBackgroundPaneMaxFps(value)
+  elseif key == 'foregroundFrameRate' then
+      local text = value
+      if value <= 0 or value >= 61 then
+        text = 'max'
+        value = 0
+      end
+
+      if graphicsPanel then graphicsPanel:getChildById('foregroundFrameRateLabel'):setText(tr('Interface framerate limit: %s', text)) end
+      g_app.setForegroundPaneMaxFps(value)
+  elseif key == 'painterEngine' then
+    g_graphics.selectPainterEngine(value)
   end
   g_settings.set(key, value)
   options[key] = value
@@ -142,3 +165,5 @@ end
 function Options.getOption(key)
   return options[key]
 end
+
+

modules/corelib/ui/uiscrollbar.lua

@@ -101,7 +101,7 @@ end
 
 function UIScrollBar:onSetup()
   self.setupDone = true
-  signalcall(self.onValueChange, self, self.value)
+  --signalcall(self.onValueChange, self, self.value)
   g_mouse.bindAutoPress(self:getChildById('decrementButton'), function() self:decrement() end)
   g_mouse.bindAutoPress(self:getChildById('incrementButton'), function() self:increment() end)
   g_mouse.bindPressMove(self:getChildById('sliderButton'), function(mousePos, mouseMoved) parseSliderPos(self, mousePos) end)

src/framework/graphics/graphics.cpp

@@ -186,7 +186,7 @@ bool Graphics::selectPainterEngine(PainterEngine painterEngine)
 #endif
 
     // switch painters GL state
-    if(painter && painter != g_painter) {
+    if(painter) {
         if(g_painter)
             g_painter->unbind();
         painter->bind();