From df16b60f4ab98b868713db8455bb1b6f9e7cf78e Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Sun, 11 Jul 2021 18:39:30 -0400
Subject: [PATCH] ENH use enum for x/y alignment

---
 core                   |  2 +-
 drawing/Common.lua     | 20 ++++++++++----------
 drawing/FileSystem.lua |  4 ++--
 drawing/Memory.lua     |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core b/core
index 9e6e960..6d2b884 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 9e6e960796bd66bc050f2d111ecdab6c309a0874
+Subproject commit 6d2b8844900d51d94fdc8cf6e946ffa7ddd464e4
diff --git a/drawing/Common.lua b/drawing/Common.lua
index f5aba34..a1f8e77 100644
--- a/drawing/Common.lua
+++ b/drawing/Common.lua
@@ -31,15 +31,15 @@ M.label_font_spec = M.make_font_spec(_G_Patterns_.FONT, 8, false)
 M.left_text_style = _G_Widget_.text_style(
    M.normal_font_spec,
    _G_Patterns_.INACTIVE_TEXT_FG,
-   'left',
-   'center'
+   _G_Widget_.X_ALIGN.LEFT,
+   _G_Widget_.Y_ALIGN.CENTER
 )
 
 M.right_text_style = _G_Widget_.text_style(
    M.normal_font_spec,
    _G_Patterns_.PRIMARY_FG,
-   'right',
-   'center'
+   _G_Widget_.X_ALIGN.RIGHT,
+   _G_Widget_.Y_ALIGN.CENTER
 )
 
 local _bare_text = function(pt, text, style)
@@ -69,8 +69,8 @@ M.Header = function(x, y, w, s)
          _G_Widget_.text_style(
             M.make_font_spec(_G_Patterns_.FONT, HEADER_FONT_SIZE, true),
             _G_Patterns_.HEADER_FG,
-            'left',
-            'top'
+            _G_Widget_.X_ALIGN.LEFT,
+            _G_Widget_.Y_ALIGN.TOP
          )
       ),
       bottom_y = bottom_y,
@@ -238,8 +238,8 @@ M.initTextRing = function(x, y, r, fmt, limit)
          _G_Widget_.text_style(
             M.normal_font_spec,
             _G_Patterns_.PRIMARY_FG,
-            'center',
-            'center'
+            _G_Widget_.X_ALIGN.MIDDLE,
+            _G_Widget_.Y_ALIGN.CENTER
          ),
          fmt,
          _G_Widget_.threshold_text_style(
@@ -321,8 +321,8 @@ M.initTextRowCrit = function(x, y, w, label, append_end, limit)
          _G_Widget_.text_style(
             M.normal_font_spec,
             _G_Patterns_.PRIMARY_FG,
-            'right',
-            'center'
+            _G_Widget_.X_ALIGN.RIGHT,
+            _G_Widget_.Y_ALIGN.CENTER
          ),
             append_end,
          _G_Widget_.threshold_text_style(
diff --git a/drawing/FileSystem.lua b/drawing/FileSystem.lua
index ceee143..1de5126 100644
--- a/drawing/FileSystem.lua
+++ b/drawing/FileSystem.lua
@@ -75,8 +75,8 @@ local labels = _G_Widget_.TextColumn(
    _G_Widget_.text_style(
       Common.normal_font_spec,
       _G_Patterns_.INACTIVE_TEXT_FG,
-      'left',
-      'center'
+      _G_Widget_.X_ALIGN.LEFT,
+      _G_Widget_.Y_ALIGN.CENTER
    ),
    nil,
    _SPACING_
diff --git a/drawing/Memory.lua b/drawing/Memory.lua
index 62d991b..cc80277 100644
--- a/drawing/Memory.lua
+++ b/drawing/Memory.lua
@@ -106,8 +106,8 @@ local cache = {
       _G_Widget_.text_style(
          Common.normal_font_spec,
          _G_Patterns_.INACTIVE_TEXT_FG,
-         'left',
-         'center'
+         _G_Widget_.X_ALIGN.LEFT,
+         _G_Widget_.Y_ALIGN.CENTER
       ),
       nil,
       _TEXT_SPACING_
@@ -121,8 +121,8 @@ local cache = {
       _G_Widget_.text_style(
          Common.normal_font_spec,
          _G_Patterns_.SECONDARY_FG,
-         'right',
-         'center'
+         _G_Widget_.X_ALIGN.RIGHT,
+         _G_Widget_.Y_ALIGN.CENTER
       ),
       '%s%%',
       _TEXT_SPACING_