fixed bugs in framework

dualface · May 23, 2015 · ff4e527 · ff4e527
1 parent d453775
commit ff4e527
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/quick/framework/cc/uiloader/CCSUILoader2.lua b/quick/framework/cc/uiloader/CCSUILoader2.lua
@@ -416,7 +416,7 @@ function CCSUILoader:createButton(options)
  node:setButtonLabel(
  cc.ui.UILabel.new({text = options.ButtonText,
  size = options.FontSize,
- font = options.fontName,
+ font = options.FontResource and options.FontResource.Path,
  color = cc.c3b(options.TextColor.R, options.TextColor.G, options.TextColor.B)}))
  end
  if options.Size then

diff --git a/quick/framework/display.lua b/quick/framework/display.lua
@@ -830,7 +830,7 @@ end
 function display.newFilteredSprite(filename, filters, params)
  local __one = {class=cc.FilteredSpriteWithOne}
  local __multi = {class=cc.FilteredSpriteWithMulti}
- if not filters then return display.newSprite(filtename, nil,nil , __one) end
+ if not filters then return display.newSprite(filename, nil,nil , __one) end
  local __sp = nil
  local __type = type(filters)
  if __type == "userdata" then __type = tolua.type(filters) end