Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1648 from copycat-killer/color_icon_fix 

ldoc: fixes in lib/gears/color.lua and objects/client.c
This commit is contained in:
Emmanuel Lepage Vallée 2017-03-12 15:21:43 -04:00 committed by GitHub
parent 4a42ed0d44 d3b8088c1b
commit 4af6b33fbf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gears/color.lua
View File

@ -333,7 +333,7 @@ function color.recolor_image(image, new_color)
end end
--- Get a valid color for Pango markup --- Get a valid color for Pango markup
-- @param color The color. -- @param check_color The color to check.
-- @tparam string fallback The color to return if the first is invalid. (default: black) -- @tparam string fallback The color to return if the first is invalid. (default: black)
-- @treturn string color if it is valid, else fallback. -- @treturn string color if it is valid, else fallback.
function color.ensure_pango_color(check_color, fallback) function color.ensure_pango_color(check_color, fallback)

4
objects/client.c
View File

@ -387,11 +387,11 @@
* *
* **Signal:** * **Signal:**
* *
* * *property::icon* * * *property::icon\_sizes*
* *
* @property icon_sizes * @property icon_sizes
* @tparam table sizes * @tparam table sizes
* @see `get_icon` * @see get_icon
*/ */
/** /**