From 18117584c08e41a9cf1436e1770eeb1d08fcc631 Mon Sep 17 00:00:00 2001
From: Hzj_jie <hzj_jie@hotmail.com>
Date: Fri, 3 Feb 2017 20:26:47 -0800
Subject: [PATCH] Resolve review comments

---
 frontend/ui/widget/menu.lua      |  3 ++-
 frontend/ui/widget/touchmenu.lua |  3 ++-
 frontend/util.lua                | 13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua
index 3dc0bf090..8588edb2f 100644
--- a/frontend/ui/widget/menu.lua
+++ b/frontend/ui/widget/menu.lua
@@ -27,6 +27,7 @@ local util = require("ffi/util")
 local logger = require("logger")
 local Blitbuffer = require("ffi/blitbuffer")
 local _ = require("gettext")
+local getMenuText = require("util").getMenuText
 
 --[[
 Widget that displays a shortcut icon for menu item
@@ -649,7 +650,7 @@ function Menu:updateItems(select_number)
                 show_parent = self.show_parent,
                 state = self.item_table[i].state,
                 state_size = self.state_size or {},
-                text = self.item_table[i].text .. ((self.item_table[i].sub_item_table ~= nil) and " \226\150\185" or ""),
+                text = getMenuText(self.item_table[i]),
                 mandatory = self.item_table[i].mandatory,
                 bold = self.item_table.current == i or self.item_table[i].bold == true,
                 face = self.cface,
diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua
index 946a43e7c..75954749a 100644
--- a/frontend/ui/widget/touchmenu.lua
+++ b/frontend/ui/widget/touchmenu.lua
@@ -20,6 +20,7 @@ local Font = require("ui/font")
 local util = require("ffi/util")
 local _ = require("gettext")
 local Blitbuffer = require("ffi/blitbuffer")
+local getMenuText = require("util").getMenuText
 
 --[[
 TouchMenuItem widget
@@ -78,7 +79,7 @@ function TouchMenuItem:init()
                 item_checked and checked_widget or unchecked_widget
             },
             TextWidget:new{
-                text = (self.item.text or self.item.text_func()) .. ((self.item.sub_item_table == nil) and "" or " \226\150\185"),
+                text = getMenuText(self.item),
                 fgcolor = item_enabled ~= false and Blitbuffer.COLOR_BLACK or Blitbuffer.COLOR_GREY,
                 face = self.face,
             },
diff --git a/frontend/util.lua b/frontend/util.lua
index 68377df53..3aaae5351 100755
--- a/frontend/util.lua
+++ b/frontend/util.lua
@@ -266,4 +266,17 @@ function util.splitFileNameSuffix(file)
     return string.gsub(file, "(.*)%.(.*)", "%1"), string.gsub(file, ".*%.", "")
 end
 
+function util.getMenuText(item)
+    local text
+    if item.text_func then
+        text = item.text_func()
+    else
+        text = item.text
+    end
+    if item.sub_item_table ~= nil then
+        text = text .. " \226\150\182"
+    end
+    return text
+end
+
 return util