Merge pull request #18 from Nats-ji/proper-theme-impl

modularize theme

scripts/modules/CETMM.lua

@@ -121,9 +121,7 @@ end
 function CETMM.Render()
   registerForEvent("onDraw", function()
     m_gui.Initialize()
-    m_gui.GetStyle().PushTheme()
     m_gui.Render()
-    m_gui.GetStyle().PopTheme()
   end)
 end
 

scripts/modules/gui/init.lua

@@ -2,7 +2,7 @@ local CETMM = require ("modules/CETMM")
 ---@class gui
 local gui = {}
 local m_dpi = require ("modules/gui/dpi")
-local m_style = require ("modules/gui/style")
+local m_themeSys = require ("modules/gui/themeSys")
 local m_widgets = require ("modules/gui/widgets")
 local m_window = require ("modules/gui/window")
 local m_windows = require ("modules/gui/windows")
@@ -13,8 +13,8 @@ function gui.GetDPI()
   return m_dpi
 end
 
-function gui.GetStyle()
-  return m_style
+function gui.GetThemeSys()
+  return m_themeSys
 end
 
 function gui.GetWindow()
@@ -25,19 +25,24 @@ function gui.Initialize()
   if not m_initialized then
     m_showUninstall = CETMM.IsUninstalled()
     m_dpi.Initialize()
-    if not m_showUninstall then
+    if m_showUninstall then
+      m_themeSys.Load("default", true)
+    else
+      m_themeSys.Initialize()
       m_window.Initialize()
     end
     m_initialized = true
   end
 end
 
 function gui.Render()
+  m_themeSys.PushTheme()
   if m_showUninstall then
     m_windows.uninstall.Render()
   else
     m_window.Render()
   end
+  m_themeSys.PopTheme()
 end
 
 return gui